[Checkins] SVN: zope.authentication/trunk/ Added Python 3.3 support and tox testing.
Stephen Richter
cvs-admin at zope.org
Thu Feb 21 16:40:32 UTC 2013
Log message for revision 129578:
Added Python 3.3 support and tox testing.
Changed:
_U zope.authentication/trunk/
U zope.authentication/trunk/CHANGES.txt
A zope.authentication/trunk/MANIFEST.in
U zope.authentication/trunk/bootstrap.py
U zope.authentication/trunk/buildout.cfg
U zope.authentication/trunk/setup.py
U zope.authentication/trunk/src/zope/authentication/logout.txt
U zope.authentication/trunk/src/zope/authentication/principal.py
U zope.authentication/trunk/src/zope/authentication/principalterms.txt
U zope.authentication/trunk/src/zope/authentication/tests/test_principal.py
A zope.authentication/trunk/tox.ini
-=-
Property changes on: zope.authentication/trunk
___________________________________________________________________
Modified: svn:ignore
- bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
coverage
+ .tox
.coverage
bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
coverage
Modified: zope.authentication/trunk/CHANGES.txt
===================================================================
--- zope.authentication/trunk/CHANGES.txt 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/CHANGES.txt 2013-02-21 16:40:32 UTC (rev 129578)
@@ -2,11 +2,14 @@
CHANGES
=======
-4.0.1 (unreleased)
+4.1.0 (unreleased)
------------------
-- TBD
+- Added Python 3.3 support.
+- Added tox.ini and MANIFEST.in.
+
+
4.0.0 (2012-07-04)
------------------
Added: zope.authentication/trunk/MANIFEST.in
===================================================================
--- zope.authentication/trunk/MANIFEST.in (rev 0)
+++ zope.authentication/trunk/MANIFEST.in 2013-02-21 16:40:32 UTC (rev 129578)
@@ -0,0 +1,9 @@
+include *.rst
+include *.txt
+include *.py
+include buildout.cfg
+include tox.ini
+
+recursive-include src *
+
+global-exclude *.pyc
Modified: zope.authentication/trunk/bootstrap.py
===================================================================
--- zope.authentication/trunk/bootstrap.py 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/bootstrap.py 2013-02-21 16:40:32 UTC (rev 129578)
@@ -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.authentication/trunk/buildout.cfg
===================================================================
--- zope.authentication/trunk/buildout.cfg 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/buildout.cfg 2013-02-21 16:40:32 UTC (rev 129578)
@@ -4,11 +4,11 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.authentication
+eggs = zope.authentication[test]
[coverage-test]
recipe = zc.recipe.testrunner
-eggs = zope.authentication
+eggs = zope.authentication[test]
defaults = ['--coverage', '../../coverage']
[coverage-report]
Modified: zope.authentication/trunk/setup.py
===================================================================
--- zope.authentication/trunk/setup.py 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/setup.py 2013-02-21 16:40:32 UTC (rev 129578)
@@ -19,6 +19,21 @@
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.authentication',
version = '4.0.1dev',
author='Zope Foundation and Contributors',
@@ -46,6 +61,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',
@@ -55,6 +73,10 @@
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope'],
+ extras_require=dict(
+ test=[
+ 'zope.testing',
+ ]),
install_requires=['setuptools',
'zope.browser',
'zope.component>=3.6.0',
@@ -63,6 +85,11 @@
'zope.schema',
'zope.security',
],
+ tests_require = [
+ 'zope.testing',
+ 'zope.testrunner',
+ ],
+ test_suite = '__main__.alltests',
include_package_data = True,
zip_safe = False,
)
Modified: zope.authentication/trunk/src/zope/authentication/logout.txt
===================================================================
--- zope.authentication/trunk/src/zope/authentication/logout.txt 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/src/zope/authentication/logout.txt 2013-02-21 16:40:32 UTC (rev 129578)
@@ -20,7 +20,7 @@
... pass
...
... def logout(self, request):
- ... print 'User has logged out'
+ ... print('User has logged out')
>>> provideAdapter(SimpleLogout)
Modified: zope.authentication/trunk/src/zope/authentication/principal.py
===================================================================
--- zope.authentication/trunk/src/zope/authentication/principal.py 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/src/zope/authentication/principal.py 2013-02-21 16:40:32 UTC (rev 129578)
@@ -13,6 +13,7 @@
##############################################################################
"""Principal source and helper function
"""
+import base64
from zope.browser.interfaces import ITerms
from zope.component import getUtility, queryNextUtility, adapter
from zope.interface import implementer, Interface
@@ -21,15 +22,20 @@
from zope.authentication.interfaces import IAuthentication, IPrincipalSource
from zope.authentication.interfaces import PrincipalLookupError
+try:
+ unicode
+except NameError:
+ # Py3: define unicode.
+ unicode = str
def checkPrincipal(context, principal_id):
"""An utility function to check if there's a principal for given principal id.
-
+
Raises ValueError when principal doesn't exists for given context and
principal id.
To test it, let's create and register a dummy authentication utility.
-
+
>>> @implementer(IAuthentication)
... class DummyUtility:
...
@@ -42,13 +48,13 @@
>>> provideUtility(DummyUtility())
Now, let's the behaviour of this function.
-
+
>>> checkPrincipal(None, 'bob')
>>> checkPrincipal(None, 'dan')
Traceback (most recent call last):
...
ValueError: ('Undefined principal id', 'dan')
-
+
"""
auth = getUtility(IAuthentication, context=context)
try:
@@ -169,6 +175,18 @@
def __init__(self, context, request):
self.context = context
+ def _encode(self, id):
+ # Py3: In Python 2, principal_id can be a str, but in Python 3 it is
+ # always unicode/str.
+ if isinstance(id, unicode):
+ id = id.encode('utf-8')
+
+ res = base64.b64encode(id).strip().replace(b'=', b'_')
+ return res.decode()
+
+ def _decode(self, token):
+ return base64.b64decode(token.replace('_', '=').encode()).decode('utf-8')
+
def getTerm(self, principal_id):
if principal_id not in self.context:
raise LookupError(principal_id)
@@ -180,11 +198,10 @@
# TODO: is this a possible case?
raise LookupError(principal_id)
- return PrincipalTerm(principal_id.encode('base64').strip().replace('=', '_'),
- principal.title)
+ return PrincipalTerm(self._encode(principal_id), principal.title)
def getValue(self, token):
- return token.replace('_', '=').decode('base64')
+ return self._decode(token)
class PrincipalTerm(object):
Modified: zope.authentication/trunk/src/zope/authentication/principalterms.txt
===================================================================
--- zope.authentication/trunk/src/zope/authentication/principalterms.txt 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/src/zope/authentication/principalterms.txt 2013-02-21 16:40:32 UTC (rev 129578)
@@ -16,7 +16,7 @@
>>> from zope.authentication.interfaces import PrincipalLookupError
>>> @implementer(IAuthentication)
... class AuthUtility:
- ... data = {'jim': 'Jim Fulton', 'stephan': 'Stephan Richter'}
+ ... data = {u'jim': u'Jim Fulton', u'stephan': u'Stephan Richter'}
...
... def getPrincipal(self, id):
... title = self.data.get(id)
@@ -49,7 +49,7 @@
Now we can ask the terms view for terms:
- >>> term = terms.getTerm('stephan')
+ >>> term = terms.getTerm(u'stephan')
>>> term.title
'Stephan Richter'
>>> term.token
Modified: zope.authentication/trunk/src/zope/authentication/tests/test_principal.py
===================================================================
--- zope.authentication/trunk/src/zope/authentication/tests/test_principal.py 2013-02-21 16:10:37 UTC (rev 129577)
+++ zope.authentication/trunk/src/zope/authentication/tests/test_principal.py 2013-02-21 16:40:32 UTC (rev 129578)
@@ -14,11 +14,21 @@
"""Test for principal lookup related functionality
"""
import doctest
+import re
import unittest
+from zope.testing import renormalizing
+checker = renormalizing.RENormalizing([
+ # Python 3 strings remove the "u".
+ (re.compile("u('.*?')"),
+ r"\1"),
+ (re.compile('u(".*?")'),
+ r"\1"),
+ ])
+
def test_suite():
return unittest.TestSuite((
- doctest.DocTestSuite('zope.authentication.principal'),
- doctest.DocFileSuite('../principalterms.txt'),
+ doctest.DocTestSuite('zope.authentication.principal', checker=checker),
+ doctest.DocFileSuite('../principalterms.txt', checker=checker),
))
Added: zope.authentication/trunk/tox.ini
===================================================================
--- zope.authentication/trunk/tox.ini (rev 0)
+++ zope.authentication/trunk/tox.ini 2013-02-21 16:40:32 UTC (rev 129578)
@@ -0,0 +1,19 @@
+[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 =
+ zope.browser
+ zope.component
+ zope.i18nmessageid
+ zope.interface
+ zope.schema
+ zope.security
+ zope.testing
+ zope.testrunner
+
More information about the checkins
mailing list