Merge "Assignment to reserved built-in symbol: dir"

openstack · Aug 20, 2013 · 0b2a160 · 0b2a160
2 parents 777ff1f + 73e9ff5
commit 0b2a160
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/keystone/common/openssl.py b/keystone/common/openssl.py
@@ -74,11 +74,11 @@ def __init__(self, conf_obj, keystone_user, keystone_group, **kwargs):
         self.ssl_dictionary.update(kwargs)
 
     def _make_dirs(self, file_name):
-        dir = os.path.dirname(file_name)
-        if not file_exists(dir):
-            os.makedirs(dir, DIR_PERMS)
+        dir_name = os.path.dirname(file_name)
+        if not file_exists(dir_name):
+            os.makedirs(dir_name, DIR_PERMS)
         if os.geteuid() == 0 and self.use_keystone_group:
-            os.chown(dir, -1, self.use_keystone_group)
+            os.chown(dir_name, -1, self.use_keystone_group)
 
     def _set_permissions(self, file_name, perms):
         os.chmod(file_name, perms)