[Checkins] SVN: megrok.z3cform.base/trunk/src/megrok/z3cform/base/ Corrected OS-dependent path splitting/joining.
Souheil CHELFOUH
souheil at chelfouh.com
Thu Feb 11 18:20:50 EST 2010
Log message for revision 108940:
Corrected OS-dependent path splitting/joining.
Changed:
U megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py
U megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_widgettemplate.py
-=-
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py 2010-02-11 19:32:17 UTC (rev 108939)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py 2010-02-11 23:20:49 UTC (rev 108940)
@@ -1,4 +1,5 @@
import martian
+import os.path
import grokcore.view
import grokcore.component
import grokcore.viewlet
@@ -66,8 +67,8 @@
def execute(self, factory, config, context, layer,
template, view, field, widget, mode, **kw):
- template_path = '/'.join(factory.module_info.path.split('/')[:-1])
- template = "%s/%s" %(template_path, template)
+ template_path = os.path.split(factory.module_info.path)[0]
+ template = os.path.join(template_path, template)
widgetTemplateDirective(config, template, context, layer,
view=view, field=field, widget=widget, mode=mode)
return True
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_widgettemplate.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_widgettemplate.py 2010-02-11 19:32:17 UTC (rev 108939)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_widgettemplate.py 2010-02-11 23:20:49 UTC (rev 108940)
@@ -142,4 +142,3 @@
suite = doctest.DocTestSuite(optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
suite.layer = FunctionalLayer
return suite
-
More information about the checkins
mailing list