Port to Python 3.3.

.gitignore

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

CHANGES.txt

@@ -2,8 +2,10 @@
 CHANGES
 =======
 
-2.0.0 (unreleased)
-------------------
+2.0.0a1 (unreleased)
+--------------------
+
+- Added support for Python 3.3.
 
 - Replaced deprecated ``zope.component.adapts`` usage with equivalent
   ``zope.component.adapter`` decorator.

MANIFEST.in

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

bootstrap.py

@@ -16,103 +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$
 """
 
-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]
+
+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.
 
-# 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.")
+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.add_option("-c", None, action="store", dest="config_file",
+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]
 
-if options.version is not None:
-    VERSION = '==%s' % options.version
-else:
-    VERSION = ''
+options, args = parser.parse_args()
 
-USE_DISTRIBUTE = options.distribute
-args = args + ['bootstrap']
+######################################################################
+# load/install distribute
 
+to_reload = False
 try:
-    import pkg_resources
-    import setuptools
+    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)
-
-    reload(sys.modules['pkg_resources'])
+
+    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)
     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)
+
+######################################################################
+# Install buildout
 
-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
-
-cmd = 'from setuptools.command.easy_install import main; main()'
 ws  = pkg_resources.working_set
 
-if USE_DISTRIBUTE:
-    requirement = 'distribute'
-else:
-    requirement = 'setuptools'
-
-if is_jython:
-    import subprocess
-
-    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
-
-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
+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' + 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)

buildout.cfg

@@ -1,6 +1,7 @@
 [buildout]
 develop = .
 parts = test coverage-test coverage-report
+versions = versions
 
 [test]
 recipe = zc.recipe.testrunner
@@ -16,3 +17,12 @@ recipe = zc.recipe.egg
 eggs = z3c.coverage
 scripts = coverage=coverage-report
 arguments = ('coverage', 'coverage/report')
+
+[versions]
+zope.browserpage = 4.1.0a1
+zope.formlib = 4.3.0a1
+zope.i18n = 4.0.0a4
+zope.publisher = 4.0.0a2
+zope.security = 4.0.0a3
+zope.tal = 4.0.0a1
+zope.traversing = 4.0.0a2

setup.py

@@ -17,19 +17,15 @@
 # Zope Toolkit policies as described by this documentation.
 ##############################################################################
 """Setup for zope.mimetype package
-
-$Id$
 """
 import os
 from setuptools import setup, find_packages
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '2.0.0dev'
-
 setup(name='zope.mimetype',
-      version=version,
+      version='2.0.0a1.dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description = "A simple package for working with MIME content types",
@@ -70,6 +66,9 @@ def read(*rnames):
           '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',
@@ -79,7 +78,12 @@ def read(*rnames):
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
-      extras_require = dict(test=['zope.component [test]']),
+      extras_require = dict(
+        test=[
+            'zope.component',
+            'zope.testing',
+            ]
+        ),
       install_requires=['setuptools',
                         'zope.browser',
                         'zope.browserresource',
@@ -95,6 +99,11 @@ def read(*rnames):
                         'zope.schema',
                         'zope.security',
                         ],
+      tests_require=[
+            'zope.component',
+            'zope.testing',
+            ],
+      test_suite='zope.mimetype.tests.test_suite',
       include_package_data = True,
       zip_safe = False,
       )

src/zope/mimetype/__init__.py

@@ -1 +1 @@
-import types
+from zope.mimetype import mtypes

src/zope/mimetype/codec.txt

@@ -13,7 +13,7 @@ utilities for ICodec with the name of their python codec.
    >>> addCodec('iso8859-1', 'Western (ISO-8859-1)')
    >>> codec = component.getUtility(ICodec, name='iso8859-1')
    >>> codec
-   <zope.mimetype.codec.Codec instance at ...>
+   <zope.mimetype.codec.Codec ...>
    >>> codec.name
    'iso8859-1'
    >>> addCodec('utf-8', 'Unicode (UTF-8)')
@@ -32,7 +32,7 @@ as a utility for ICharsetCodec with the name of the charset.
    >>> addCharset(codec.name, 'latin1')
    >>> charset = component.getUtility(ICharset, name='latin1')
    >>> charset
-   <zope.mimetype.codec.Charset instance at ...>
+   <zope.mimetype.codec.Charset ...>
    >>> charset.name
    'latin1'
    >>> component.getUtility(ICharsetCodec, name='latin1') is codec
@@ -57,12 +57,12 @@ ICodecPreferredCharset under the name of the python codec.
    >>> from zope.mimetype.interfaces import ICodecPreferredCharset
    >>> preferred = component.getUtility(ICodecPreferredCharset, name='iso8859-1')
    >>> preferred
-   <zope.mimetype.codec.Charset instance at ...>
+   <zope.mimetype.codec.Charset ...>
    >>> preferred.name
    'iso8859-1'
    >>> sorted(component.getUtilitiesFor(ICodecPreferredCharset))
-   [(u'iso8859-1', <zope.mimetype.codec.Charset instance at ...>),
-    (u'utf-8', <zope.mimetype.codec.Charset instance at ...>)]
+   [(u'iso8859-1', <zope.mimetype.codec.Charset ...>),
+    (u'utf-8', <zope.mimetype.codec.Charset ...>)]
 
 We can look up a codec by the name of its charset:
 
@@ -74,8 +74,8 @@ We can look up a codec by the name of its charset:
 Or we can look up all codecs:
 
    >>> sorted(component.getUtilitiesFor(ICharsetCodec))
-   [(u'iso8859-1', <zope.mimetype.codec.Codec instance at ...>),
-    (u'latin1', <zope.mimetype.codec.Codec instance at ...>),
-    (u'test', <zope.mimetype.codec.Codec instance at ...>),
-    (u'utf-8', <zope.mimetype.codec.Codec instance at ...>)]
+   [(u'iso8859-1', <zope.mimetype.codec.Codec ...>),
+    (u'latin1', <zope.mimetype.codec.Codec ...>),
+    (u'test', <zope.mimetype.codec.Codec ...>),
+    (u'utf-8', <zope.mimetype.codec.Codec ...>)]