[Checkins] SVN: z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/ Fix test failures.
Marius Gedminas
marius at pov.lt
Mon Dec 12 11:34:50 UTC 2011
Log message for revision 123715:
Fix test failures.
I'm not sure where the dependency on 'six' comes froms (pytz, perhaps?).
And it looks like zc.buildout 1.5.2 changed its templates or something: witness
the BUILDOUT_ORIGINAL_PYTHONPATH changes, and the extra code in the generated
addsitepackages. It's possible that my changes will break the tests if run
with zc.buildout 1.5.1. If this happens, please yell at me, and I'll try to
come up with some ellipses to make them pass on both.
Changed:
U z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/README.txt
U z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/tests.py
-=-
Modified: z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/README.txt
===================================================================
--- z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/README.txt 2011-12-12 10:58:37 UTC (rev 123714)
+++ z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/README.txt 2011-12-12 11:34:49 UTC (rev 123715)
@@ -219,8 +219,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
import os
@@ -254,8 +254,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
@@ -280,8 +280,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
@@ -306,8 +306,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
@@ -387,8 +387,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
import os
@@ -422,6 +422,7 @@
"""Add site packages, as determined by zc.buildout.
<BLANKLINE>
See original_addsitepackages, below, for the original version."""
+ ...
buildout_paths = [
...
'/sample-buildout/extra/path/1',
@@ -432,6 +433,7 @@
if not sitedircase in known_paths and os.path.exists(sitedir):
sys.path.append(sitedir)
known_paths.add(sitedircase)
+ ...
return known_paths
<BLANKLINE>
...
@@ -452,8 +454,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
@@ -478,8 +480,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
@@ -573,8 +575,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
import os
@@ -664,8 +666,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
@@ -696,8 +698,8 @@
import os
path = sys.path[0]
if os.environ.get('PYTHONPATH'):
- os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ['PYTHONPATH']
path = os.pathsep.join([path, os.environ['PYTHONPATH']])
+ os.environ['BUILDOUT_ORIGINAL_PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
os.environ['PYTHONPATH'] = path
import site # imports custom buildout-generated site.py
<BLANKLINE>
Modified: z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/tests.py
===================================================================
--- z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/tests.py 2011-12-12 10:58:37 UTC (rev 123714)
+++ z3c.recipe.i18n/trunk/src/z3c/recipe/i18n/tests.py 2011-12-12 11:34:49 UTC (rev 123715)
@@ -24,6 +24,7 @@
zc.buildout.testing.install('ZConfig', test)
zc.buildout.testing.install('ZODB3', test)
zc.buildout.testing.install('pytz', test)
+ zc.buildout.testing.install('six', test)
zc.buildout.testing.install('transaction', test)
zc.buildout.testing.install('zc.lockfile', test)
zc.buildout.testing.install('zc.recipe.egg', test)
More information about the checkins
mailing list