Ported to Python 3.

.gitignore

@@ -0,0 +1,12 @@
+*.egg
+*.pyc
+__pycache__
+src/*.egg-info
+benchmark/*.egg-info
+
+.installed.cfg
+.tox
+bin
+develop-eggs
+docs
+parts

CHANGES.txt

@@ -2,10 +2,19 @@
 CHANGES
 =======
 
-0.8.1 (unreleased)
-------------------
+1.0.0a1 (unreleased)
+--------------------
+
+
+- Added support for Python 3.3.
+
+- Changed ``zope.testbrowser`` tests to ``WebTest``, since ``zope.testbrowser``
+  is not yet ported.
+
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
 
-- Nothing changed yet.
+- Dropped support for Python 2.4 and 2.5.
 
 
 0.8.0 (2010-07-12)

MANIFEST.in

@@ -0,0 +1,9 @@
+include *.rst
+include *.txt
+include *.py
+include buildout.cfg
+include tox.ini
+
+recursive-include src *
+
+global-exclude *.pyc

bootstrap.py

@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007 Zope Foundation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -16,37 +16,150 @@
 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: bootstrap.py 75940 2007-05-24 14:45:00Z srichter $
 """
 
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile
+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)
+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", 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()
+
+######################################################################
+# load/install distribute
+
+to_reload = False
+try:
+    import pkg_resources, setuptools
+    if not hasattr(pkg_resources, '_distribute'):
+        to_reload = True
+        raise ImportError
+except ImportError:
+    ez = {}
+
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
 
-import pkg_resources
+    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)
 
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
-    cmd = '"%s"' % cmd # work around spawn lamosity on windows
+    if to_reload:
+        reload(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)
 
-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
+######################################################################
+# Install buildout
+
+ws  = pkg_resources.working_set
+
+cmd = [sys.executable, '-c',
+       'from setuptools.command.easy_install import main; main()',
+       '-mZqNxd', tmpeggs]
+
+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])
+
+distribute_path = ws.find(
+    pkg_resources.Requirement.parse('distribute')).location
+
+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')
+ws.require(requirement)
 import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+
+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)

buildout.cfg

@@ -1,6 +1,12 @@
 [buildout]
 develop = .
-parts = test checker coverage-test coverage-report
+parts = py test checker coverage-test coverage-report
+versions = versions
+
+[py]
+recipe = zc.recipe.egg
+eggs = z3c.menu.ready2go [test]
+interpreter = py
 
 [test]
 recipe = zc.recipe.testrunner
@@ -22,3 +28,21 @@ recipe = zc.recipe.egg
 eggs = z3c.coverage
 scripts = coverage=coverage-report
 arguments = ('coverage', 'coverage/report')
+
+[versions]
+z3c.template = 2.0.0a2
+zope.app.appsetup = 4.0.0a1
+zope.app.publication = 4.0.0a1.dev
+zope.app.wsgi = 4.0.0a3
+zope.browserpage = 4.1.0a1
+zope.container = 4.0.0a2
+zope.contentprovider = 4.0.0a1
+zope.i18n = 4.0.0a4
+zope.publisher = 4.0.0a3
+zope.security = 4.0.0a3
+zope.securitypolicy = 4.0.0a1
+zope.session = 4.0.0a1
+zope.site = 4.0.0a1
+zope.tal = 4.0.0a1
+zope.traversing = 4.0.0a2
+zope.viewlet = 4.0.0a1

setup.py

@@ -11,16 +11,27 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-
+"""Setup
+"""
 import os
 from setuptools import setup, find_packages
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+TESTS_REQUIRE = [
+    'zope.browserpage',
+    'zope.container',
+    'zope.contentprovider',
+    'zope.component',
+    'zope.site',
+    'zope.traversing',
+    'zope.testing',
+    ]
+
 setup (
     name='z3c.menu.ready2go',
-    version='0.8.1dev',
+    version='1.0.0a1.dev',
     author = "Stephan Richter, Roger Ineichen and the Zope Community",
     author_email = "zope-dev@zope.org",
     description = "A ready to go menu for Zope3",
@@ -36,11 +47,17 @@ def read(*rnames):
     license = "ZPL 2.1",
     keywords = "zope3 z3c ready 2 go menu",
     classifiers = [
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
+        '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',
@@ -51,15 +68,7 @@ def read(*rnames):
     package_dir = {'':'src'},
     namespace_packages = ['z3c', 'z3c.menu'],
     extras_require = dict(
-        test = [
-            'z3c.testing',
-            'zope.browserpage',
-            'zope.app.testing',
-            'zope.container',
-            'zope.contentprovider',
-            'zope.component',
-            'zope.traversing',
-            ],
+        test = TESTS_REQUIRE,
         ),
     install_requires = [
         'setuptools',
@@ -76,5 +85,7 @@ def read(*rnames):
         'zope.traversing',
         'zope.viewlet',
         ],
+    tests_require=TESTS_REQUIRE,
+    test_suite='z3c.menu.ready2go.tests.test_suite',
     zip_safe = False,
 )