Added support for 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
 =======
 
-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.

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

@@ -18,33 +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()
 
-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]
 
-import pkg_resources
+Bootstraps a buildout-based project.
 
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
-    cmd = '"%s"' % cmd # work around spawn lamosity on windows
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
 
-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
+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
+
+    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
+
+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,7 +1,20 @@
 [buildout]
 develop = .
+find-links =
+    ${buildout:directory}/ZODB-4.0.0dev.tar.gz
 parts = test
+versions = versions
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = zope.catalog [test]
+
+[versions]
+ZODB = 4.0.0dev
+zope.container = 4.0.0a2
+zope.index = 4.0.0
+zope.intid = 4.0.0a1
+zope.keyreference = 4.0.0a2
+zope.publisher = 4.0.0a2
+zope.site = 4.0.0a1
+zope.traversing = 4.0.0a2

setup.py

@@ -25,7 +25,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'zope.catalog',
-      version='4.0.0dev',
+      version='4.0.0a1.dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
       description='Cataloging and Indexing Framework for the Zope Toolkit',
@@ -51,6 +51,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',
@@ -66,7 +69,7 @@ def read(*rnames):
                 ]),
       install_requires = [
           'setuptools',
-          'ZODB3',
+          'BTrees',
           'zope.annotation',
           'zope.intid',
           'zope.component',
@@ -77,6 +80,8 @@ def read(*rnames):
           'zope.location',
           'zope.schema',
           ],
+      tests_require = ['zope.testing', 'zope.site'],
+      test_suite = 'zope.catalog.tests.test_suite',
       include_package_data = True,
       zip_safe = False,
       )

src/zope/catalog/README.txt

@@ -56,7 +56,9 @@ we'll write the base index class:
     ...         return set
     ...
     ...     def sort(self, docids, limit=None, reverse=False):
-    ...         for i, docid in enumerate(sorted(docids, key=self.backward.get, reverse=reverse)):
+    ...         key_func = lambda x: self.backward.get(x, -1)
+    ...         for i, docid in enumerate(
+    ...                  sorted(docids, key=key_func, reverse=reverse)):
     ...             yield docid
     ...             if limit and i >= (limit - 1):
     ...                 break
@@ -73,7 +75,7 @@ index:
     >>> import zope.container.contained
 
     >>> @zope.interface.implementer(zope.catalog.interfaces.ICatalogIndex)
-    ... class Index(zope.catalog.attribute.AttributeIndex, 
+    ... class Index(zope.catalog.attribute.AttributeIndex,
     ...             BaseIndex,
     ...             zope.container.contained.Contained,
     ...             ):
@@ -82,7 +84,7 @@ index:
 Unfortunately, because of the way we currently handle containment
 constraints, we have to provide `ICatalogIndex`, which extends
 `IContained`. We subclass `Contained` to get an implementation for
-`IContained`. 
+`IContained`.
 
 Now let's add some of these indexes to our catalog.  Let's create some
 indexes.  First we'll define some interfaces providing data to index:
@@ -200,9 +202,9 @@ create a utility to work with our catalog:
     ...     def getObject(self, id):
     ...         return self.data[id]
     ...     def __iter__(self):
-    ...         return self.data.iterkeys()
+    ...         return iter(self.data)
     >>> ids = Ids({1: o1, 2: o2, 3: o3, 4: o4, 5: o5, 6: o6})
-    
+
     >>> from zope.component import provideUtility
     >>> provideUtility(ids, zope.intid.interfaces.IIntIds)
 
@@ -224,7 +226,7 @@ We can update all of the indexes:
     [1, 6]
     >>> list(cat.apply({'color': 'red'}))
     [2]
-    
+
 
 There's an alternate search interface that returns "result sets".
 Result sets provide access to objects, rather than object ids:
@@ -330,7 +332,7 @@ values:
     ...         return result
 
     >>> @zope.interface.implementer(zope.catalog.interfaces.ICatalogIndex)
-    ... class KeywordIndex(zope.catalog.attribute.AttributeIndex, 
+    ... class KeywordIndex(zope.catalog.attribute.AttributeIndex,
     ...                    BaseKeywordIndex,
     ...                    zope.container.contained.Contained,
     ...                    ):

src/zope/catalog/catalog.py

@@ -120,7 +120,7 @@ def apply(self, query):
             # no applicable indexes, so catalog was not applicable
             return None
 
-        results.sort() # order from smallest to largest
+        results.sort(key=lambda x: x[0]) # order from smallest to largest
 
         _, result = results.pop(0)
         for _, r in results:

src/zope/catalog/tests.py

@@ -16,6 +16,7 @@
 Note that indexes &c already have test suites, we only have to check that
 a catalog passes on events that it receives.
 """
+import re
 import unittest
 from zope.testing import doctest
 from zope.interface import implementer, Interface
@@ -41,6 +42,15 @@
 from zope.catalog.interfaces import ICatalog
 from zope.catalog.catalog import Catalog
 from zope.catalog.field import FieldIndex
+from zope.testing import renormalizing
+
+checker = renormalizing.RENormalizing([
+    # Python 3 unicode removed the "u".
+    (re.compile("u('.*?')"),
+     r"\1"),
+    (re.compile('u(".*?")'),
+     r"\1"),
+    ])
 
 
 class ReferenceStub:
@@ -88,7 +98,7 @@ def queryId(self, ob, default=None):
         return self.ids.get(ob, default)
 
     def __iter__(self):
-        return self.objs.iterkeys()
+        return iter(self.objs.keys())
 
 
 @implementer(IIndexSearch, IInjection)
@@ -207,7 +217,7 @@ def test_basicsearch(self):
 
         res = catalog.searchResults(simiantype='punyhuman', name='anthony')
         self.assertEqual(len(res), 1)
-        ob = iter(res).next()
+        ob = next(iter(res))
         self.assertEqual((ob.name, ob.simiantype), ('anthony', 'punyhuman'))
 
         res = catalog.searchResults(simiantype='ape', name='bobo')
@@ -724,12 +734,14 @@ def test_suite():
         'README.txt',
         setUp=placelessSetUp,
         tearDown=placelessTearDown,
+        checker=checker,
         ))
     suite.addTest(doctest.DocFileSuite(
         'event.txt',
         setUp=setUp,
         tearDown=lambda x: placefulTearDown(),
         optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+        checker=checker,
         ))
 
     return suite