Changeset 1357 in products for quintagroup.themetemplate/trunk/quintagroup/themetemplate/localcommands

Timestamp:

Nov 1, 2009 11:07:11 AM (15 years ago)

Author:

mylan

Message:

#108: Refactored theme vars storage, some cleanup

Location:

quintagroup.themetemplate/trunk/quintagroup/themetemplate/localcommands

Files:

• __init__.py (modified) (3 diffs)
• subtemplates.py (modified) (3 diffs)

quintagroup.themetemplate/trunk/quintagroup/themetemplate/localcommands/__init__.py

@@ -4 +4 @@
 import os
 from ConfigParser import SafeConfigParser
-from paste.script import pluginlib
 
 from zopeskel.base import var
 from zopeskel.localcommands import ZopeSkelLocalTemplate
+
+from quintagroup.themetemplate import getEggInfo
+from quintagroup.themetemplate import getThemeVarsFP
 
 class QThemeSubTemplate(ZopeSkelLocalTemplate):
@@ -58 +60 @@
 
         res = {}
-        egg_info = pluginlib.find_egg_info_dir(output_dir)
-        theme_vars_fp = os.path.join(egg_info, 'theme_vars.txt')
+        egg_info = getEggInfo(output_dir)
+        theme_vars_fp = getThemeVarsFP(egg_info)
 
-        if egg_info and os.path.exists(theme_vars_fp):
+        if os.path.exists(theme_vars_fp):
             config = SafeConfigParser()
             config.read(theme_vars_fp)
@@ -77 +79 @@
     def add_template_vars(self, output_dir, vars):
 
-        egg_info = pluginlib.find_egg_info_dir(output_dir)
-        theme_vars_fp = os.path.join(egg_info, 'theme_vars.txt')
+        egg_info = getEggInfo(output_dir)
+        theme_vars_fp = getThemeVarsFP(egg_info)
 
-        if egg_info and os.path.exists(theme_vars_fp):
+        if os.path.exists(theme_vars_fp):
             config = SafeConfigParser()
             config.read(theme_vars_fp)

quintagroup.themetemplate/trunk/quintagroup/themetemplate/localcommands/subtemplates.py

@@ -8 +8 @@
 from zopeskel.base import var
 from zopeskel.localcommands import ZopeSkelLocalTemplate
+
+from quintagroup.themetemplate import getEggInfo
+from quintagroup.themetemplate import getThemeVarsFP
 from quintagroup.themetemplate.localcommands import QThemeSubTemplate
 
@@ -156 +159 @@
     def add_order_tag(self, output_dir, vars, pmarker):
         need_update = True
-        egg_info = pluginlib.find_egg_info_dir(output_dir)
-        theme_vars_fp = os.path.join(egg_info, 'theme_vars.txt')
-
-        if egg_info and os.path.exists(theme_vars_fp):
+        egg_info = getEggInfo(output_dir)
+        theme_vars_fp = getThemeVarsFP(egg_info)
+
+        if os.path.exists(theme_vars_fp):
             config = SafeConfigParser()
             config.read(theme_vars_fp)
@@ -215 +218 @@
     def add_hidden_tag(self, output_dir, vars, pmarker):
         add_hidden = True
-        egg_info = pluginlib.find_egg_info_dir(output_dir)
-        theme_vars_fp = os.path.join(egg_info, 'theme_vars.txt')
-
-        if egg_info and os.path.exists(theme_vars_fp):
+        egg_info = getEggInfo(output_dir)
+        theme_vars_fp = getThemeVarsFP(egg_info)
+
+        if os.path.exists(theme_vars_fp):
             config = SafeConfigParser()
             config.read(theme_vars_fp)