[Erp5-report] r36125 luke - /erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

[nobody at svn.erp5.org]

Author: luke
Date: Wed Jun  9 09:43:52 2010
New Revision: 36125

URL: http://svn.erp5.org?rev=36125&view=rev
Log:
 - continue refactoring, rename getTemplateDirectoryList to initialiseTemplateDirectoryList
 - make initialiseTemplateDirectoryList real class method
 - fix unbound name error after last refactoring step

Modified:
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py?rev=36125&r1=36124&r2=36125&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] Wed Jun  9 09:43:52 2010
@@ -406,34 +406,34 @@
     logging_kw = dict(level=logging.INFO,
         format='%(asctime)s:%(levelname)s:%(name)s:%(message)s')
     if self.options.log_file is not None:
-      logging_kw['filename'] = options.log_file
+      logging_kw['filename'] = self.options.log_file
     logging.basicConfig(**logging_kw)
     self.time_begin = time.time()
     logging.info('[%s] Timmy started' % os.getpid())
-    self.options.template_directory_list = self.getTemplateDirectoryList(self.options.template_directory)
-
-  def getTemplateDirectoryList(self, user_template_directory):
+    self.initialiseTemplateDirectoryList()
+
+  def initialiseTemplateDirectoryList(self):
     """Returns list of directories, in which there might be templates"""
-    template_directory_list = []
+    self.template_directory_list = []
     if pkg_resources.resource_isdir(__name__, 'template'):
       template_directory = pkg_resources.resource_filename(__name__, "template")
-      template_directory_list.append(template_directory)
+      self.template_directory_list.append(template_directory)
       logging.info('Using %r as fallback directory with templates' %
           template_directory)
 
-    if user_template_directory is not None:
-      if os.path.isdir(user_template_directory):
-        template_directory = os.path.abspath(user_template_directory)
-        template_directory_list.append(template_directory)
+    if self.options.template_directory is not None:
+      if os.path.isdir(self.options.template_directory):
+        template_directory = os.path.abspath(self.options.template_directory)
+        self.template_directory_list.append(template_directory)
         logging.info('Using %r as default directory with templates' %
             template_directory)
       else:
         logging.warning('User template %r is not a directory' %
             template_directory)
-    if len(template_directory_list) == 0:
+    if len(self.template_directory_list) == 0:
       logging.warning('No templates were found, some functionality will be not available')
-    template_directory_list.reverse()
-    return template_directory_list
+    self.template_directory_list.reverse()
+    return self.template_directory_list
 
   def run(self):
     try:
@@ -497,7 +497,7 @@
 
         # 1a pass - instance profiles
         try:
-          self.updateInstanceProfiles(self.options.template_directory_list,
+          self.updateInstanceProfiles(self.template_directory_list,
             self.options.instances_directory, partition_dict_list)
         except:
           server.call('updatePartitionState', computer_id, 'reportError',
@@ -506,7 +506,7 @@
           raise
         # 1b pass - main profile
         try:
-          self.updateBaseProfile(self.options.template_directory_list, self.options.main_output,
+          self.updateBaseProfile(self.template_directory_list, self.options.main_output,
             self.options.base_profile, self.options.instances_directory,
             partition_dict_list)
         except: