[Checkins] SVN: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/ fixed dotted names creation
Christophe Combelles
ccomb at free.fr
Tue Mar 30 20:02:56 EDT 2010
Log message for revision 110349:
fixed dotted names creation
Changed:
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
-=-
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl 2010-03-30 23:30:49 UTC (rev 110348)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl 2010-03-31 00:02:56 UTC (rev 110349)
@@ -44,6 +44,6 @@
<include package="zope.traversing.browser" />
<include package="zope.app.pagetemplate" />
- <include package="${ns_prefix}.${main_package}" />
+ <include package="${ns_prefix}${main_package}" />
</configure>
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl 2010-03-30 23:30:49 UTC (rev 110348)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl 2010-03-31 00:02:56 UTC (rev 110349)
@@ -57,9 +57,9 @@
],
entry_points = """
[paste.app_factory]
- main = ${ns_prefix}.${main_package}.startup:application_factory
+ main = ${ns_prefix}${main_package}.startup:application_factory
[paste.global_paster_command]
- shell = ${ns_prefix}.${main_package}.debug:Shell
+ shell = ${ns_prefix}${main_package}.debug:Shell
""",
)
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl 2010-03-30 23:30:49 UTC (rev 110348)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl 2010-03-31 00:02:56 UTC (rev 110349)
@@ -48,6 +48,6 @@
<grantAll role="zope.Manager" />
<grant role="zope.Manager" principal="zope.mgr" />
- <include package="${ns_prefix}.${main_package}" />
+ <include package="${ns_prefix}${main_package}" />
</configure>
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl 2010-03-30 23:30:49 UTC (rev 110348)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl 2010-03-31 00:02:56 UTC (rev 110349)
@@ -1,3 +1,3 @@
import z3c.testsetup
-test_suite = z3c.testsetup.register_all_tests('${ns_prefix}.${main_package}')
+test_suite = z3c.testsetup.register_all_tests('${ns_prefix}${main_package}')
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py 2010-03-30 23:30:49 UTC (rev 110348)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py 2010-03-31 00:02:56 UTC (rev 110349)
@@ -54,8 +54,8 @@
vars['namespace_packages'] = [
vars['package'].rsplit('.', i)[0]
for i in range(1,len(self.ns_split))]
- vars['ns_prefix'] = '.'.join(self.ns_split[:-1])
- if len(self.ns_split) == 0:
+ vars['ns_prefix'] = '.'.join(self.ns_split[:-1]) + '.'
+ if len(self.ns_split) == 1:
vars['ns_prefix'] = ''
return templates.Template.check_vars(self, vars, cmd)
More information about the checkins
mailing list