[Checkins] SVN: z3ext.cssregistry/trunk/ fix tests
Nikolay Kim
fafhrd91 at gmail.com
Tue Jan 18 10:46:54 EST 2011
Log message for revision 119655:
fix tests
Changed:
U z3ext.cssregistry/trunk/CHANGES.txt
U z3ext.cssregistry/trunk/bootstrap.py
U z3ext.cssregistry/trunk/buildout.cfg
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/README.txt
-=-
Modified: z3ext.cssregistry/trunk/CHANGES.txt
===================================================================
--- z3ext.cssregistry/trunk/CHANGES.txt 2011-01-18 15:30:55 UTC (rev 119654)
+++ z3ext.cssregistry/trunk/CHANGES.txt 2011-01-18 15:46:53 UTC (rev 119655)
@@ -1,10 +1,3 @@
-======
-Issues
-======
-
-- There are currently some strage test failures. Maybe the same problem as
- in ``z3c.zrtresource`` on which this package depends on.
-
=======
CHANGES
=======
Modified: z3ext.cssregistry/trunk/bootstrap.py
===================================================================
--- z3ext.cssregistry/trunk/bootstrap.py 2011-01-18 15:30:55 UTC (rev 119654)
+++ z3ext.cssregistry/trunk/bootstrap.py 2011-01-18 15:46:53 UTC (rev 119655)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Foundation and Contributors.
+# Copyright (c) 2006 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -16,37 +16,105 @@
Simply run this script in a directory containing a buildout.cfg.
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
-
-$Id$
"""
-import os, shutil, sys, tempfile, urllib2
+import os
+import shutil
+import sys
+import tempfile
+import urllib2
+from optparse import OptionParser
tmpeggs = tempfile.mkdtemp()
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+is_jython = sys.platform.startswith('java')
-import pkg_resources
+# parsing arguments
+parser = OptionParser()
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="distribute", default=False,
+ help="Use Disribute rather than Setuptools.")
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.version is not None:
+ VERSION = '==%s' % options.version
+else:
+ VERSION = ''
+
+# We decided to always use distribute, make sure this is the default for us
+# USE_DISTRIBUTE = options.distribute
+USE_DISTRIBUTE = True
+args = args + ['bootstrap']
+
+to_reload = False
+try:
+ import pkg_resources
+ if not hasattr(pkg_resources, '_distribute'):
+ to_reload = True
+ raise ImportError
+except ImportError:
+ ez = {}
+ if USE_DISTRIBUTE:
+ setup_url = 'http://python-distribute.org/distribute_setup.py'
+ exec urllib2.urlopen(setup_url).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
+ else:
+ ez_setup_url = 'http://peak.telecommunity.com/dist/ez_setup.py'
+ exec urllib2.urlopen(ez_setup_url).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+ if to_reload:
+ reload(pkg_resources)
+ else:
+ import pkg_resources
+
+
+def quote(c):
+ if sys.platform == 'win32':
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ return c
+
cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
-
ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+if USE_DISTRIBUTE:
+ requirement = 'distribute'
+else:
+ requirement = 'setuptools'
+
+pythonpath = ws.find(pkg_resources.Requirement.parse(requirement)).location
+
+if is_jython:
+ import subprocess
+
+ assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+ quote(tmpeggs), 'zc.buildout' + VERSION],
+ env=dict(os.environ,
+ PYTHONPATH=pythonpath),
+ ).wait() == 0
+
+else:
+ assert os.spawnle(
+ os.P_WAIT, sys.executable, quote(sys.executable),
+ '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout' + VERSION,
+ dict(os.environ,
+ PYTHONPATH=pythonpath),
+ ) == 0
+
ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+ws.require('zc.buildout' + VERSION)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
Modified: z3ext.cssregistry/trunk/buildout.cfg
===================================================================
--- z3ext.cssregistry/trunk/buildout.cfg 2011-01-18 15:30:55 UTC (rev 119654)
+++ z3ext.cssregistry/trunk/buildout.cfg 2011-01-18 15:46:53 UTC (rev 119655)
@@ -1,6 +1,7 @@
[buildout]
develop = .
parts = test coverage-test coverage-report
+versions = versions
[test]
recipe = zc.recipe.testrunner
@@ -16,3 +17,7 @@
eggs = z3c.coverage
scripts = coverage=coverage-report
arguments = ('coverage', 'coverage/report')
+
+[versions]
+zc.recipe.testrunner = 1.2.1
+zope.testing = 3.9.5
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/README.txt
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/README.txt 2011-01-18 15:30:55 UTC (rev 119654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/README.txt 2011-01-18 15:46:53 UTC (rev 119655)
@@ -126,6 +126,7 @@
font: Arial;
}
+
We also can use named cssregistries
>>> context = xmlconfig.string("""
@@ -150,6 +151,8 @@
... font: fontFamilyH2;
... }''')
+ >>> cssFactory = ZRTFileResourceFactory(fn, None, 'site.css')
+ >>> css = cssFactory(TestRequest())
>>> print css.GET()
h1 {
color: #d5d5d5;
@@ -169,6 +172,9 @@
... color: color1;
... font: fontFamilyH1;
... }''')
+
+ >>> cssFactory = ZRTFileResourceFactory(fn, None, 'site.css')
+ >>> css = cssFactory(TestRequest())
>>> print css.GET()
h1 {
color: color1;
More information about the checkins
mailing list