Re-tabbed managers.py under reload (was set to 4 spaces)

reload/managers.py

@@ -1,51 +1,51 @@
 import functions_general
 
 class ReloadManager(object):
-    objects_cache = {}
+   objects_cache = {}
-    failed = []
+   failed = []
 
-    models = {}
+   models = {}
 
-    def __init__(self, server):
+   def __init__(self, server):
-        self.server = server
+      self.server = server
 
-    def do_cache(self):
+   def do_cache(self):
-        for module, info in self.models.iteritems():
+      for module, info in self.models.iteritems():
-            module_obj = __import__(module)
+         module_obj = __import__(module)
-            for ituple in info:
+         for ituple in info:
-                mclass = getattr(module_obj, info[0])
+            mclass = getattr(module_obj, info[0])
-                for instance in mclass.__instances__():
+            for instance in mclass.__instances__():
-                    instance.cache(self, do_save=ituple[1])
+               instance.cache(self, do_save=ituple[1])
 
-    def do_reload(self):
+   def do_reload(self):
-        self.do_cache()
+      self.do_cache()
-        self.server.reload()
+      self.server.reload()
-        self.reload_objects()
+      self.reload_objects()
 
-    def cache_object(self, obj):
+   def cache_object(self, obj):
-        obj_dict = {}
+      obj_dict = {}
-        for key, value in obj.__dict__.iteritems():
+      for key, value in obj.__dict__.iteritems():
-            if not callable(obj[key]):
+         if not callable(obj[key]):
-                obj_dict[key] = value
+            obj_dict[key] = value
 
-        self.objects_cache[obj] = obj_dict
+      self.objects_cache[obj] = obj_dict
 
-    def reload_objects(self):
+   def reload_objects(self):
-        for obj, cache in self.objects_cache.iteritems():
+      for obj, cache in self.objects_cache.iteritems():
-            try:
+      try:
-                obj.reload(cache)
+         obj.reload(cache)
-            except:
+      except:
-                functions_general.log_errmsg("Failed to reload cache for object: %s." % (obj,))
+         functions_general.log_errmsg("Failed to reload cache for object: %s." % (obj,))
-                self.failed.append(obj)
+         self.failed.append(obj)
-                raise
+         raise
 
-        self.objects_cache = {}
+      self.objects_cache = {}
 
-        for obj in self.failed:
+      for obj in self.failed:
-            try:
+      try:
-                obj.__dict__.update(cache)
+         obj.__dict__.update(cache)
-            except:
+      except:
-                functions_general.log_errmsg("Failed to update object %s, giving up." %s (obj,))
+         functions_general.log_errmsg("Failed to update object %s, giving up." %s (obj,))
-                raise
+         raise
 
-        self.failed = []
+      self.failed = []