[Checkins] SVN: zope.site/trunk/ Added support for Python 3.3. The unreleased zope.publisher and ZODB
Stephen Richter
cvs-admin at zope.org
Wed Feb 20 21:39:28 UTC 2013
Log message for revision 129543:
Added support for Python 3.3. The unreleased zope.publisher and ZODB
packages are included, so that the tox and buildout tests can run.
Changed:
_U zope.site/trunk/
U zope.site/trunk/CHANGES.txt
A zope.site/trunk/MANIFEST.in
A zope.site/trunk/ZODB-4.0.0dev.tar.gz
U zope.site/trunk/bootstrap.py
U zope.site/trunk/buildout.cfg
U zope.site/trunk/setup.py
U zope.site/trunk/src/zope/site/testing.py
U zope.site/trunk/src/zope/site/tests/folder.txt
U zope.site/trunk/src/zope/site/tests/test_configure.py
U zope.site/trunk/src/zope/site/tests/test_folder.py
U zope.site/trunk/src/zope/site/tests/test_site.py
U zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py
A zope.site/trunk/tox.ini
A zope.site/trunk/zope.publisher-4.0.0dev.tar.gz
-=-
Property changes on: zope.site/trunk
___________________________________________________________________
Modified: svn:ignore
- bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
coverage
+ .tox
bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
coverage
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/CHANGES.txt 2013-02-20 21:39:27 UTC (rev 129543)
@@ -2,9 +2,11 @@
CHANGES
=======
-4.0.0 (unreleased)
+4.0.0a1 (unreleased)
------------------
+- Added support for Python 3.3.
+
- Replaced deprecated ``zope.interface.implements`` usage with equivalent
``zope.interface.implementer`` decorator.
Added: zope.site/trunk/MANIFEST.in
===================================================================
--- zope.site/trunk/MANIFEST.in (rev 0)
+++ zope.site/trunk/MANIFEST.in 2013-02-20 21:39:27 UTC (rev 129543)
@@ -0,0 +1,9 @@
+include *.rst
+include *.txt
+include *.py
+include buildout.cfg
+include tox.ini
+
+recursive-include src *
+
+global-exclude *.pyc
Added: zope.site/trunk/ZODB-4.0.0dev.tar.gz
===================================================================
(Binary files differ)
Property changes on: zope.site/trunk/ZODB-4.0.0dev.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: zope.site/trunk/bootstrap.py
===================================================================
--- zope.site/trunk/bootstrap.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/bootstrap.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -18,102 +18,148 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile
from optparse import OptionParser
tmpeggs = tempfile.mkdtemp()
-is_jython = sys.platform.startswith('java')
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-# 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.")
+Bootstraps a buildout-based project.
-parser.add_option("-c", None, action="store", dest="config_file",
+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", help="use a specific zc.buildout version")
+
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true", default=False,
+ 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", "--config-file",
help=("Specify the path to the buildout configuration "
"file to be used."))
+parser.add_option("-f", "--find-links",
+ help=("Specify a URL to search for buildout releases"))
+
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]
+######################################################################
+# load/install distribute
-if options.version is not None:
- VERSION = '==%s' % options.version
-else:
- VERSION = ''
-
-USE_DISTRIBUTE = options.distribute
-args = args + ['bootstrap']
-
to_reload = False
try:
- import pkg_resources
+ import pkg_resources, setuptools
if not hasattr(pkg_resources, '_distribute'):
to_reload = True
raise ImportError
except ImportError:
ez = {}
- if USE_DISTRIBUTE:
- exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
- ).read() in ez
- ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
- else:
- exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
- ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+ try:
+ from urllib.request import urlopen
+ except ImportError:
+ from urllib2 import urlopen
+
+ exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
+ setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
+ ez['use_setuptools'](**setup_args)
+
if to_reload:
reload(pkg_resources)
- else:
- import 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)
-if sys.platform == 'win32':
- def quote(c):
- if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
- else:
- return c
-else:
- def quote (c):
- return c
+######################################################################
+# Install buildout
-cmd = 'from setuptools.command.easy_install import main; main()'
ws = pkg_resources.working_set
-if USE_DISTRIBUTE:
- requirement = 'distribute'
-else:
- requirement = 'setuptools'
+cmd = [sys.executable, '-c',
+ 'from setuptools.command.easy_install import main; main()',
+ '-mZqNxd', tmpeggs]
-if is_jython:
- import subprocess
+find_links = os.environ.get(
+ 'bootstrap-testing-find-links',
+ options.find_links or
+ ('http://downloads.buildout.org/'
+ if options.accept_buildout_test_releases else None)
+ )
+if find_links:
+ cmd.extend(['-f', find_links])
- assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
- quote(tmpeggs), 'zc.buildout' + VERSION],
- env=dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse(requirement)).location
- ),
- ).wait() == 0
+distribute_path = ws.find(
+ pkg_resources.Requirement.parse('distribute')).location
-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=
- ws.find(pkg_resources.Requirement.parse(requirement)).location
- ),
- ) == 0
+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=[distribute_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)
+import subprocess
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+ raise Exception(
+ "Failed to execute command:\n%s",
+ repr(cmd)[1:-1])
+
+######################################################################
+# Import and run buildout
+
ws.add_entry(tmpeggs)
-ws.require('zc.buildout' + VERSION)
+ws.require(requirement)
import zc.buildout.buildout
+
+if not [a for a in args if '=' not in a]:
+ args.append('bootstrap')
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+ args[0:0] = ['-c', options.config_file]
+
zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
Modified: zope.site/trunk/buildout.cfg
===================================================================
--- zope.site/trunk/buildout.cfg 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/buildout.cfg 2013-02-20 21:39:27 UTC (rev 129543)
@@ -1,6 +1,10 @@
[buildout]
develop = .
+find-links =
+ ${buildout:directory}/zope.publisher-4.0.0dev.tar.gz
+ ${buildout:directory}/ZODB-4.0.0dev.tar.gz
parts = test coverage-test coverage-report
+versions = versions
[test]
recipe = zc.recipe.testrunner
@@ -16,3 +20,7 @@
eggs = z3c.coverage
scripts = coverage=coverage-report
arguments = ('coverage', 'coverage/report')
+
+[versions]
+ZODB = 4.0.0dev
+zope.publisher = 4.0.0dev
Modified: zope.site/trunk/setup.py
===================================================================
--- zope.site/trunk/setup.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/setup.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -24,8 +24,23 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+def alltests():
+ import os
+ import sys
+ import unittest
+ # use the zope.testrunner machinery to find all the
+ # test suites we've put under ourselves
+ import zope.testrunner.find
+ import zope.testrunner.options
+ here = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))
+ args = sys.argv[:]
+ defaults = ["--test-path", here]
+ options = zope.testrunner.options.get_options(args, defaults)
+ suites = list(zope.testrunner.find.find_suites(options))
+ return unittest.TestSuite(suites)
+
setup(name='zope.site',
- version='3.9.3dev',
+ version='4.0.0a1.dev',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description='Local registries for zope component architecture',
@@ -47,6 +62,9 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: Implementation :: CPython',
'Natural Language :: English',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
@@ -62,18 +80,29 @@
'zope.configuration',
'zope.security[zcml]',
'zope.testing',
+ 'ZODB',
]),
install_requires=[
'setuptools',
'zope.annotation',
- 'zope.container',
- 'zope.security',
+ 'zope.container>=4.0.0a1',
+ 'zope.security>=4.0.0a3',
'zope.component>=3.8.0',
'zope.event',
'zope.interface',
'zope.lifecycleevent',
'zope.location>=3.7.0',
],
+ tests_require = [
+ 'zope.testing',
+ 'zope.testrunner',
+ 'zope.component[zcml]',
+ 'zope.configuration',
+ 'zope.security[zcml]',
+ 'zope.testing',
+ 'ZODB',
+ ],
+ test_suite = '__main__.alltests',
include_package_data = True,
zip_safe = False,
)
Modified: zope.site/trunk/src/zope/site/testing.py
===================================================================
--- zope.site/trunk/src/zope/site/testing.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/src/zope/site/testing.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -13,6 +13,7 @@
##############################################################################
"""Reusable functionality for testing site-related code
"""
+import re
import zope.component
import zope.component.hooks
import zope.component.interfaces
@@ -23,8 +24,17 @@
from zope.interface import Interface
from zope.site import LocalSiteManager, SiteManagerAdapter
from zope.site.folder import rootFolder
+from zope.testing import renormalizing
+checker = renormalizing.RENormalizing([
+ # Python 3 unicode removed the "u".
+ (re.compile("u('.*?')"),
+ r"\1"),
+ (re.compile('u(".*?")'),
+ r"\1"),
+ ])
+
def createSiteManager(folder, setsite=False):
if not zope.component.interfaces.ISite.providedBy(folder):
folder.setSiteManager(LocalSiteManager(folder))
Modified: zope.site/trunk/src/zope/site/tests/folder.txt
===================================================================
--- zope.site/trunk/src/zope/site/tests/folder.txt 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/src/zope/site/tests/folder.txt 2013-02-20 21:39:27 UTC (rev 129543)
@@ -23,11 +23,11 @@
<LocalSiteManager ++etc++site>
>>> list(fs_folder.__iter__())
['++etc++site']
- >>> fs_folder.values()
+ >>> list(fs_folder.values())
[<LocalSiteManager ++etc++site>]
>>> len(fs_folder)
1
- >>> fs_folder.items()
+ >>> list(fs_folder.items())
[('++etc++site', <LocalSiteManager ++etc++site>)]
>>> '++etc++site' in fs_folder
True
@@ -39,7 +39,7 @@
The site folder now contains the new folder:
- >>> fs_folder.keys()
+ >>> list(fs_folder.keys())
[u'test', '++etc++site']
>>> fs_folder.get('test')
<zope.site.folder.Folder object at 0x...>
@@ -47,11 +47,11 @@
<zope.site.folder.Folder object at 0x...>
>>> list(fs_folder.__iter__())
[u'test', '++etc++site']
- >>> fs_folder.values()
+ >>> list(fs_folder.values())
[<zope.site.folder.Folder object at 0x...>, <LocalSiteManager ++etc++site>]
>>> len(fs_folder)
2
- >>> fs_folder.items()
+ >>> list(fs_folder.items())
[(u'test', <zope.site.folder.Folder object at 0x...>),
('++etc++site', <LocalSiteManager ++etc++site>)]
>>> 'test' in fs_folder
Modified: zope.site/trunk/src/zope/site/tests/test_configure.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_configure.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/src/zope/site/tests/test_configure.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -24,7 +24,7 @@
try:
zope.configuration.xmlconfig.XMLConfig(
'configure.zcml', zope.site)()
- except Exception, e:
+ except Exception as e:
self.fail(e)
def test_configure_should_register_n_components(self):
Modified: zope.site/trunk/src/zope/site/tests/test_folder.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_folder.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/src/zope/site/tests/test_folder.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -3,7 +3,7 @@
import doctest
from zope.site.folder import Folder
-from zope.site.testing import siteSetUp, siteTearDown
+from zope.site.testing import siteSetUp, siteTearDown, checker
from zope.site.tests.test_site import BaseTestSiteManagerContainer
def setUp(test=None):
@@ -27,5 +27,5 @@
setUp=setUp, tearDown=tearDown),
doctest.DocFileSuite("folder.txt",
setUp=setUp, tearDown=tearDown,
- optionflags=flags),
+ checker=checker, optionflags=flags),
))
Modified: zope.site/trunk/src/zope/site/tests/test_site.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_site.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/src/zope/site/tests/test_site.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -52,7 +52,7 @@
>>> site.setSiteManager(sm)
then the adapter simply return's the site's site manager:
-
+
>>> from zope.site import SiteManagerAdapter
>>> SiteManagerAdapter(site) is sm
True
@@ -64,7 +64,7 @@
>>> ob2 = folder.Folder()
>>> ob2.__parent__ = ob
- we 'acquire' the closest site and return its site manager:
+ we 'acquire' the closest site and return its site manager:
>>> SiteManagerAdapter(ob) is sm
True
@@ -73,7 +73,7 @@
If we are unable to find a local site manager, then the global site
manager is returned.
-
+
>>> import zope.component
>>> orphan = CustomFolder('orphan')
>>> SiteManagerAdapter(orphan) is zope.component.getGlobalSiteManager()
@@ -114,7 +114,7 @@
def setUp(test):
testing.siteSetUp()
-
+
def tearDown(test):
testing.siteTearDown()
@@ -138,4 +138,4 @@
unittest.makeSuite(SiteManagerContainerTest),
site_suite,
))
-
+
Modified: zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py 2013-02-20 15:23:10 UTC (rev 129542)
+++ zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py 2013-02-20 21:39:27 UTC (rev 129543)
@@ -81,7 +81,7 @@
try:
del self.root['container']
- except Exception, e:
+ except Exception as e:
self.fail(e)
Added: zope.site/trunk/tox.ini
===================================================================
--- zope.site/trunk/tox.ini (rev 0)
+++ zope.site/trunk/tox.ini 2013-02-20 21:39:27 UTC (rev 129543)
@@ -0,0 +1,24 @@
+[tox]
+envlist =
+ py26,py27,py33
+
+[testenv]
+commands =
+ python setup.py test -q
+# without explicit deps, setup.py test will download a bunch of eggs into $PWD
+# (and it seems I can't use zope.dottedname[testing] here, so forget DRY)
+deps =
+ {toxinidir}/zope.publisher-4.0.0dev.tar.gz
+ {toxinidir}/ZODB-4.0.0dev.tar.gz
+ zope.annotation
+ zope.component[zcml]
+ zope.configuration
+ zope.container
+ zope.event
+ zope.interface
+ zope.lifecycleevent
+ zope.location
+ zope.security[zcml]>=4.0.0a3
+ zope.testing
+ zope.testrunner
+
Added: zope.site/trunk/zope.publisher-4.0.0dev.tar.gz
===================================================================
(Binary files differ)
Property changes on: zope.site/trunk/zope.publisher-4.0.0dev.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the checkins
mailing list