[Checkins] SVN: zope.error/trunk/ Infrastructure upgrade before adding support for python-3
Andrey Lebedev
cvs-admin at zope.org
Thu Feb 21 15:53:25 UTC 2013
Log message for revision 129569:
Infrastructure upgrade before adding support for python-3
* tox configuration added
* new bootstrap.py with support for buildout2
* doctests converted to unit tests
Changed:
U zope.error/trunk/bootstrap.py
U zope.error/trunk/buildout.cfg
U zope.error/trunk/setup.py
U zope.error/trunk/src/zope/error/tests.py
A zope.error/trunk/tox.ini
-=-
Modified: zope.error/trunk/bootstrap.py
===================================================================
--- zope.error/trunk/bootstrap.py 2013-02-21 14:14:48 UTC (rev 129568)
+++ zope.error/trunk/bootstrap.py 2013-02-21 15:53:24 UTC (rev 129569)
@@ -18,33 +18,240 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile, textwrap
+try:
+ import urllib.request as urllib2
+except ImportError:
+ import urllib2
+import subprocess
+from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ quote = str
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+ [sys.executable, '-S', '-c',
+ 'try:\n'
+ ' import pickle\n'
+ 'except ImportError:\n'
+ ' print(1)\n'
+ 'else:\n'
+ ' print(0)\n'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
-import pkg_resources
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded. This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient. However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = list(map(quote, args))
+ os.execv(sys.executable, args)
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+# Now we are running with -S. We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in list(sys.modules.items()):
+ if k in ('setuptools', 'pkg_resources') or (
+ hasattr(v, '__path__') and
+ len(v.__path__)==1 and
+ not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ # This is a namespace package. Remove it.
+ sys.modules.pop(k)
+is_jython = sys.platform.startswith('java')
+
+setup_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+ if value:
+ if '://' not in value: # It doesn't smell like a URL.
+ value = 'file://%s' % (
+ urllib2.pathname2url(
+ os.path.abspath(os.path.expanduser(value))),)
+ if opt_str == '--download-base' and not value.endswith('/'):
+ # Download base needs a trailing slash to make the world happy.
+ value += '/'
+ else:
+ value = None
+ name = opt_str[2:].replace('-', '_')
+ setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("--setup-version", dest="setup_version",
+ help="The version of distribute to use.")
+parser.add_option("--download-base", action="callback", dest="download_base",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or directory for downloading "
+ "zc.buildout and Distribute. "
+ "Defaults to PyPI."))
+parser.add_option("--eggs",
+ help=("Specify a directory for storing eggs. Defaults to "
+ "a temporary directory that is deleted when the "
+ "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true",
+ default=sys.version_info[0] > 2,
+ help=("Normally, if you do not specify a --version, the "
+ "bootstrap script and buildout gets the newest "
+ "*final* versions of zc.buildout and its recipes and "
+ "extensions for you. If you use this flag, "
+ "bootstrap and buildout will get the newest releases "
+ "even if they are alphas or betas."))
+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's main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.eggs:
+ eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+ eggs_dir = tempfile.mkdtemp()
+
+if options.accept_buildout_test_releases:
+ args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+ import pkg_resources
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ if not hasattr(pkg_resources, '_distribute'):
+ raise ImportError
+except ImportError:
+ ez_code = urllib2.urlopen(
+ setup_source).read().replace('\r\n'.encode(), '\n'.encode())
+ ez = {}
+ exec(ez_code, ez)
+ setup_args = dict(to_dir=eggs_dir, download_delay=0)
+ if options.download_base:
+ setup_args['download_base'] = options.download_base
+ if options.setup_version:
+ setup_args['version'] = options.setup_version
+ setup_args['no_fake'] = True
+ ez['use_setuptools'](**setup_args)
+ if 'pkg_resources' in sys.modules:
+ if sys.version_info[0] >= 3:
+ import imp
+ reload_ = imp.reload
+ else:
+ reload_ = reload
+
+ reload_(sys.modules['pkg_resources'])
+ import pkg_resources
+ # This does not (always?) update the default working set. We will
+ # do it.
+ for path in sys.path:
+ if path not in pkg_resources.working_set.entries:
+ pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(eggs_dir)]
+
+if not has_broken_dash_S:
+ cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+ find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+ cmd.extend(['-f', quote(find_links)])
+
+setup_requirement = 'distribute'
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
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+ # Figure out the most recent final version of zc.buildout.
+ import setuptools.package_index
+ _final_parts = '*final-', '*final'
+ def _final_version(parsed_version):
+ for part in parsed_version:
+ if (part[:1] == '*') and (part not in _final_parts):
+ return False
+ return True
+ index = setuptools.package_index.PackageIndex(
+ search_path=[setup_requirement_path])
+ if find_links:
+ index.add_find_links((find_links,))
+ req = pkg_resources.Requirement.parse(requirement)
+ if index.obtain(req) is not None:
+ best = []
+ bestv = None
+ for dist in index[req.project_name]:
+ distv = dist.parsed_version
+ if _final_version(distv):
+ if bestv is None or distv > bestv:
+ best = [dist]
+ bestv = distv
+ elif distv == bestv:
+ best.append(dist)
+ if best:
+ best.sort()
+ version = best[-1].version
+if version:
+ requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+ import subprocess
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ print("An error occurred when trying to install zc.buildout. "
+ "Look above this message for any errors that "
+ "were output by easy_install.")
+ sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
Modified: zope.error/trunk/buildout.cfg
===================================================================
--- zope.error/trunk/buildout.cfg 2013-02-21 14:14:48 UTC (rev 129568)
+++ zope.error/trunk/buildout.cfg 2013-02-21 15:53:24 UTC (rev 129569)
@@ -1,7 +1,11 @@
[buildout]
develop = .
parts = test
+versions=versions
+[versions]
+zope.interface = >4.0.2
+
[test]
recipe = zc.recipe.testrunner
eggs = zope.error [test]
Modified: zope.error/trunk/setup.py
===================================================================
--- zope.error/trunk/setup.py 2013-02-21 14:14:48 UTC (rev 129568)
+++ zope.error/trunk/setup.py 2013-02-21 15:53:24 UTC (rev 129569)
@@ -65,6 +65,7 @@
test=[
'zope.testing >= 3.8',
]),
+ test_suite = 'zope.error.tests',
include_package_data = True,
zip_safe = False,
)
Modified: zope.error/trunk/src/zope/error/tests.py
===================================================================
--- zope.error/trunk/src/zope/error/tests.py 2013-02-21 14:14:48 UTC (rev 129568)
+++ zope.error/trunk/src/zope/error/tests.py 2013-02-21 15:53:24 UTC (rev 129569)
@@ -181,43 +181,32 @@
self.getPrintable(NonStr()))
-def doctest_getFormattedException():
- """Test for getFormattedException
+ def test_getFormattedException(self):
+ try:
+ raise Exception('<boom>')
+ except:
+ self.assertTrue("Exception: <boom>" in
+ getFormattedException(sys.exc_info()))
+ else:
+ self.fail("Exception was not raised (should never happen)")
- >>> try:
- ... raise Exception('<boom>')
- ... except:
- ... print getFormattedException(sys.exc_info()),
- Traceback (most recent call last):
- Module zope.error.tests, line 2, in <module>
- raise Exception('<boom>')
- Exception: <boom>
+ def test_getFormattedException_as_html(self):
+ try:
+ raise Exception('<boom>')
+ except:
+ fe = getFormattedException(sys.exc_info(), as_html=True);
+ self.assertTrue("<p>Traceback (most recent call last):</p>" in fe)
+ self.assertTrue("</ul><p>Exception: <boom><br />" in fe)
+ self.assertTrue("</p><br />" in fe)
+ else:
+ self.fail("Exception was not raised (should never happen)")
- """
+ # If this fails because you get '<br />' instead of '<br />' at
+ # the end of the penultimate line, you need zope.exceptions 4.0.3 with
+ # the bugfix for that.
-def doctest_getFormattedException_as_html():
- """Test for getFormattedException
-
- >>> try:
- ... raise Exception('<boom>')
- ... except:
- ... print getFormattedException(sys.exc_info(), as_html=True),
- <p>Traceback (most recent call last):</p>
- <ul>
- <li> Module zope.error.tests, line 2, in <module><br />
- raise Exception('<boom>')</li>
- </ul><p>Exception: <boom><br />
- </p><br />
-
- If this fails because you get '<br />' instead of '<br />' at the
- end of the penultimate line, you need zope.exceptions 4.0.3 with the bugfix
- for that.
- """
-
-
def test_suite():
return unittest.TestSuite([
unittest.defaultTestLoader.loadTestsFromName(__name__),
- doctest.DocTestSuite(optionflags=doctest.NORMALIZE_WHITESPACE),
])
Added: zope.error/trunk/tox.ini
===================================================================
--- zope.error/trunk/tox.ini (rev 0)
+++ zope.error/trunk/tox.ini 2013-02-21 15:53:24 UTC (rev 129569)
@@ -0,0 +1,8 @@
+[tox]
+envlist = py26,py27
+
+[testenv]
+commands =
+ python setup.py test -q
+deps =
+ zope.testing
More information about the checkins
mailing list