Python 3.3 compatibility added.

.gitignore

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

CHANGES.txt

@@ -1,10 +1,12 @@
 ``zope.structuredtext`` Changelog
 =================================
 
-Unreleased
-----------
+4.0.0 (unreleased)
+------------------
+
+- Added support for Python 3.3.
 
-- TBD
+- Dropped support for Python 2.4 and 2.5.
 
 
 3.5.1 (2010-12-03)

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)

setup.py

@@ -18,9 +18,7 @@
 ##############################################################################
 """Setup for zope.structuredtext package
 """
-
 import os
-
 from setuptools import setup, find_packages
 
 def read(*rnames):
@@ -34,27 +32,32 @@ def read(*rnames):
 
 setup(
     name='zope.structuredtext',
-    version = '3.5.2dev',
-    url='http://pypi.python.org/pypi/zope.structuredtext',
+    version = '4.0.0',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
-    license='ZPL 2.1',
+    description='StructuredText parser',
+    long_description=long_description,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         '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',
         'Operating System :: OS Independent',
-        'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development',
         ],
-    description='StructuredText parser',
-    long_description=long_description,
-
+    url='http://pypi.python.org/pypi/zope.structuredtext',
+    license='ZPL 2.1',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     namespace_packages=['zope',],
+    install_requires=['setuptools', 'six'],
+    test_suite='zope.structuredtext.tests.test_suite',
     include_package_data=True,
-    install_requires=['setuptools'],
     zip_safe=False,
     )

src/zope/structuredtext/__init__.py

@@ -26,15 +26,15 @@
   >>> doc = DocumentWithImages()(struct)
 
   Now feed it to some output generator, in this case HTML or DocBook:
-  
+
   >>> output = HTMLWithImages()(doc, level=1)
   >>> output = DocBook()(doc, level=1)
 
 """
 __docformat__ = 'restructuredtext'
 
 import re
-from string import letters
+from string import ascii_letters
 
 from zope.structuredtext.stng import structurize
 from zope.structuredtext.document import DocumentWithImages
@@ -47,12 +47,12 @@ def stx2html(aStructuredString, level=1, header=1):
 
 def stx2htmlWithReferences(text, level=1, header=1):
     text = re.sub(
-        r'[\000\n]\.\. \[([0-9_%s-]+)\]' % letters,
+        r'[\000\n]\.\. \[([0-9_%s-]+)\]' % ascii_letters,
         r'\n  <a name="\1">[\1]</a>',
         text)
 
     text = re.sub(
-        r'([\000- ,])\[(?P<ref>[0-9_%s-]+)\]([\000- ,.:])' % letters,
+        r'([\000- ,])\[(?P<ref>[0-9_%s-]+)\]([\000- ,.:])' % ascii_letters,
         r'\1<a href="#\2">[\2]</a>\3',
         text)
 

src/zope/structuredtext/docbook.py

@@ -12,6 +12,7 @@
 ##############################################################################
 """ Render STX document as docbook.
 """
+from __future__ import print_function
 
 __metaclass__ = type
 
@@ -81,7 +82,7 @@ def sectionTitle(self, doc, level, output):
                 getattr(self, self.element_types[c.getNodeName()]
                        )(c, level, output)
             except:
-                print "failed", c.getNodeName(), c
+                print("failed", c.getNodeName(), c)
         output('</title>\n')
 
     def description(self, doc, level, output):