Changeset 1357 in products

Timestamp:

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

Author:

mylan

Message:

#108: Refactored theme vars storage, some cleanup

Location:

quintagroup.themetemplate/trunk

Files:

• docs/HISTORY.txt (modified) (1 diff)
• quintagroup/themetemplate/__init__.py (modified) (1 diff)
• quintagroup/themetemplate/localcommands/__init__.py (modified) (3 diffs)
• quintagroup/themetemplate/localcommands/subtemplates.py (modified) (3 diffs)
• quintagroup/themetemplate/templates/qplone3_theme/distwriters.py (deleted)
• quintagroup/themetemplate/templates/qplone3_theme/setup.py_tmpl (modified) (1 diff)
• quintagroup/themetemplate/templates/qplone3_theme/theme_vars.cfg_tmpl (added)
• setup.py (modified) (2 diffs)

quintagroup.themetemplate/trunk/docs/HISTORY.txt

@@ -2 +2 @@
 =========
 
-0.12 (unreleased)
+0.14 (unreleased)
 -----------------
 
-- Nothing changed yet.
+- Refactoring theme vars storage-now storing in separate
+  theme_vars.cfg file, without distutils writers [mylan]
+- Cleanup code [mylan]
 
 

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

@@ -1 +1 @@
 #
-import os,types
-from StringIO import StringIO
-from ConfigParser import SafeConfigParser
+import os
+from paste.script import pluginlib
 
 from quintagroup.themetemplate.qplone3_theme import qPlone3Theme
 
-def write_map(cmd, basename, filename, force=False):
-    argname = os.path.splitext(basename)[0]
-    value = getattr(cmd.distribution, argname, None)
+def getEggInfo(output_dir):
+    """ Return path to egg info directory, raise error if not found.
+    """
+    egg_info = pluginlib.find_egg_info_dir(output_dir)
+    assert egg_info is not None, "egg_info directory must present for the package"
 
-    if value:
-        config = SafeConfigParser()
-        config.add_section('qplone3_theme')
-        for name, val in value.items():
-            val = val and str(val) or ''
-            config.set('qplone3_theme', name, val)
-
-        strvalue = StringIO()
-        config.write(strvalue)
-        value = strvalue.getvalue()
-
-    cmd.write_or_delete_file(argname, filename, value, force)
+    return egg_info
 
 
-def assert_dict(dist, attr, value):
-    """Verify that value is a dict or None"""
-    try:
-        assert type(value) == types.DictType
-    except (TypeError,ValueError,AttributeError,AssertionError):
-        raise DistutilsSetupError(
-            "%r must be a dict (got %r)" % (attr,value)
-        )
+def getThemeVarsFP(egg_info):
+    """ Return file system path to theme vars configurations
+    """
+    return os.path.join(egg_info, '..', 'theme_vars.cfg')

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)

quintagroup.themetemplate/trunk/quintagroup/themetemplate/templates/qplone3_theme/setup.py_tmpl

@@ -45 +45 @@
       entry_points="""
       # -*- entry_points -*- #
-
-      [distutils.setup_keywords]
-      paster_plugins = setuptools.dist:assert_string_list
-      theme_vars = distwriters:assert_dict
-
-      [egg_info.writers]
-      paster_plugins.txt = setuptools.command.egg_info:write_arg
-      theme_vars.txt = distwriters:write_map
-
       """,
       paster_plugins = ["ZopeSkel",],
       setup_requires = ["setuptools",],
-      theme_vars = {'skinname': '$skinname',
-          'skinbase'          : '$skinbase',
-          'namespace_package' : '$namespace_package',
-          'namespace_package2': '$namespace_package2',
-          'package'           : '$package',
-          'used_subtemplates' : '',
-      },
       )

quintagroup.themetemplate/trunk/setup.py

@@ -2 +2 @@
 import os
 
-version = '0.12 dev'
+version = '0.14'
 
 tests_require=['zope.testing']
@@ -48 +48 @@
           import_zexps = quintagroup.themetemplate.localcommands.subtemplates:ImportSubTemplate
 
-          [distutils.setup_keywords]
-          theme_vars = quintagroup.themetemplate:assert_dict
-
-          [egg_info.writers]
-          theme_vars.txt = quintagroup.themetemplate:write_map
-
       # -*- Entry points: -*-
       """,