[Checkins] SVN: zope.sqlalchemy/trunk/ Merge chrism-py3 branch into trunk.
Chris McDonough
chrism at plope.com
Tue Dec 6 20:06:38 UTC 2011
Log message for revision 123603:
Merge chrism-py3 branch into trunk.
svn merge -r122963:123602 svn+ssh://svn.zope.org/repos/main/zope.sqlalchemy/branches/chrism-py3
Changed:
_U zope.sqlalchemy/trunk/
U zope.sqlalchemy/trunk/bootstrap.py
U zope.sqlalchemy/trunk/setup.py
_U zope.sqlalchemy/trunk/src/
U zope.sqlalchemy/trunk/src/zope/sqlalchemy/README.txt
U zope.sqlalchemy/trunk/src/zope/sqlalchemy/__init__.py
U zope.sqlalchemy/trunk/src/zope/sqlalchemy/tests.py
-=-
Property changes on: zope.sqlalchemy/trunk
___________________________________________________________________
Modified: svn:ignore
- parts
.installed.cfg
develop-eggs
bin
+ parts
.installed.cfg
develop-eggs
bin
eggs
env32
Modified: zope.sqlalchemy/trunk/bootstrap.py
===================================================================
--- zope.sqlalchemy/trunk/bootstrap.py 2011-12-06 19:57:42 UTC (rev 123602)
+++ zope.sqlalchemy/trunk/bootstrap.py 2011-12-06 20:06:38 UTC (rev 123603)
@@ -16,37 +16,263 @@
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 71258 2006-11-21 22:22:48Z jim $
"""
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile, textwrap
+try:
+ import urllib.request as urllib2
+except ImportError:
+ import urllib2
+import subprocess
+from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ quote = str
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+ [sys.executable, '-S', '-c',
+ 'try:\n'
+ ' import pickle\n'
+ 'except ImportError:\n'
+ ' print(1)\n'
+ 'else:\n'
+ ' print(0)\n'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
-import pkg_resources
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded. This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient. However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = list(map(quote, args))
+ os.execv(sys.executable, args)
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+# Now we are running with -S. We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in list(sys.modules.items()):
+ if k in ('setuptools', 'pkg_resources') or (
+ hasattr(v, '__path__') and
+ len(v.__path__)==1 and
+ not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ # This is a namespace package. Remove it.
+ sys.modules.pop(k)
+is_jython = sys.platform.startswith('java')
+
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+ if value:
+ if '://' not in value: # It doesn't smell like a URL.
+ value = 'file://%s' % (
+ urllib2.pathname2url(
+ os.path.abspath(os.path.expanduser(value))),)
+ if opt_str == '--download-base' and not value.endswith('/'):
+ # Download base needs a trailing slash to make the world happy.
+ value += '/'
+ else:
+ value = None
+ name = opt_str[2:].replace('-', '_')
+ setattr(parser.values, name, value)
+
+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", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("--setup-version", dest="setup_version",
+ help="The version of setuptools or distribute to use.")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="use_distribute",
+ default= sys.version_info[0] >= 3,
+ help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or file location for the setup file. "
+ "If you use Setuptools, this will default to " +
+ setuptools_source + "; if you use Distribute, this "
+ "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or directory for downloading "
+ "zc.buildout and either Setuptools or Distribute. "
+ "Defaults to PyPI."))
+parser.add_option("--eggs",
+ help=("Specify a directory for storing eggs. Defaults to "
+ "a temporary directory that is deleted when the "
+ "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true",
+ default=sys.version_info[0] > 2,
+ 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", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.eggs:
+ eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+ eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+ if options.use_distribute:
+ options.setup_source = distribute_source
+ else:
+ options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+ args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+ import pkg_resources
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ if not hasattr(pkg_resources, '_distribute'):
+ raise ImportError
+except ImportError:
+ ez_code = urllib2.urlopen(
+ options.setup_source).read().replace('\r\n'.encode(), '\n'.encode())
+ ez = {}
+ exec(ez_code, ez)
+ setup_args = dict(to_dir=eggs_dir, download_delay=0)
+ if options.download_base:
+ setup_args['download_base'] = options.download_base
+ if options.setup_version:
+ setup_args['version'] = options.setup_version
+ if options.use_distribute:
+ setup_args['no_fake'] = True
+ ez['use_setuptools'](**setup_args)
+ if 'pkg_resources' in sys.modules:
+ if sys.version_info[0] >= 3:
+ import imp
+ reload_ = imp.reload
+ else:
+ reload_ = reload
+
+ reload_(sys.modules['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)
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(eggs_dir)]
+
+if not has_broken_dash_S:
+ cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+ find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+ cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+ setup_requirement = 'distribute'
+else:
+ setup_requirement = 'setuptools'
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
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+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=[setup_requirement_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)
+
+if is_jython:
+ import subprocess
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ print("An error occurred when trying to install zc.buildout. "
+ "Look above this message for any errors that "
+ "were output by easy_install.")
+ sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
Modified: zope.sqlalchemy/trunk/setup.py
===================================================================
--- zope.sqlalchemy/trunk/setup.py 2011-12-06 19:57:42 UTC (rev 123602)
+++ zope.sqlalchemy/trunk/setup.py 2011-12-06 20:06:38 UTC (rev 123603)
@@ -1,6 +1,19 @@
+import sys
+
import os.path
from setuptools import setup, find_packages
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+ extras_require = {'test':[]}
+else:
+ extras_require= {
+ 'test': [
+ 'pysqlite',
+ ]
+ }
+
setup(
name='zope.sqlalchemy',
version='0.7dev', # Remember to update __version__ in __init__.py
@@ -21,6 +34,11 @@
classifiers=[
"Framework :: Zope3",
"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.2",
"License :: OSI Approved :: Zope Public License",
"Topic :: Software Development :: Libraries :: Python Modules",
],
@@ -31,9 +49,5 @@
'transaction',
'zope.interface',
],
- extras_require={
- 'test': [
- 'pysqlite',
- ]
- },
+ extras_require = extras_require,
)
Property changes on: zope.sqlalchemy/trunk/src
___________________________________________________________________
Added: svn:ignore
+ *.egg-info
Added: svn:externals
+
Modified: zope.sqlalchemy/trunk/src/zope/sqlalchemy/README.txt
===================================================================
--- zope.sqlalchemy/trunk/src/zope/sqlalchemy/README.txt 2011-12-06 19:57:42 UTC (rev 123602)
+++ zope.sqlalchemy/trunk/src/zope/sqlalchemy/README.txt 2011-12-06 20:06:38 UTC (rev 123603)
@@ -14,15 +14,20 @@
to configure engines.
For WSGI applications, Zope style automatic transaction management is
-available with `repoze.tm2`_, a part of `Repoze BFG`_ and `Turbogears 2`_.
+available with `repoze.tm2`_ (used by `Turbogears 2`_ and other systems).
+This package is also used by `pyramid_tm`_ (an add-on of the `Pyramid`_) web
+framework.
+
You need to understand `SQLAlchemy`_ for this package and this README to make
any sense.
.. _repoze.tm2: http://docs.repoze.org/tm2/
-.. _Repoze BFG: http://bfg.repoze.org/
+.. _pyramid_tm: https://docs.pylonsproject.org/projects/pyramid_tm/dev/
+.. _Pyramid: http://pylonsproject.org/
+
.. _Turbogears 2: http://turbogears.org/
.. _SQLAlchemy: http://sqlalchemy.org/docs/
@@ -111,8 +116,8 @@
>>> session = Session()
>>> bob = session.query(User).all()[0]
- >>> bob.name
- u'bob'
+ >>> str(bob.name)
+ 'bob'
>>> bob.addresses
[]
>>> bob.addresses.append(Address(id=1, email='bob at bob.bob'))
@@ -121,8 +126,8 @@
>>> bob = session.query(User).all()[0]
>>> bob.addresses
[<Address object at ...>]
- >>> bob.addresses[0].email
- u'bob at bob.bob'
+ >>> str(bob.addresses[0].email)
+ 'bob at bob.bob'
>>> bob.addresses[0].email = 'wrong at wrong'
To rollback a transaction, use transaction.abort().
@@ -130,8 +135,8 @@
>>> transaction.abort()
>>> session = Session()
>>> bob = session.query(User).all()[0]
- >>> bob.addresses[0].email
- u'bob at bob.bob'
+ >>> str(bob.addresses[0].email)
+ 'bob at bob.bob'
>>> transaction.abort()
By default, zope.sqlalchemy puts sessions in an 'active' state when they are
@@ -151,8 +156,8 @@
>>> mark_changed(session)
>>> transaction.commit()
>>> session = Session()
- >>> session.query(User).all()[0].name
- u'ben'
+ >>> str(session.query(User).all()[0].name)
+ 'ben'
>>> transaction.abort()
If this is a problem you may tell the extension to place the session in the
@@ -166,8 +171,8 @@
<sqlalchemy.engine.base.ResultProxy object at ...>
>>> transaction.commit()
>>> session = Session()
- >>> session.query(User).all()[0].name
- u'bob'
+ >>> str(session.query(User).all()[0].name)
+ 'bob'
>>> transaction.abort()
Development version
Modified: zope.sqlalchemy/trunk/src/zope/sqlalchemy/__init__.py
===================================================================
--- zope.sqlalchemy/trunk/src/zope/sqlalchemy/__init__.py 2011-12-06 19:57:42 UTC (rev 123602)
+++ zope.sqlalchemy/trunk/src/zope/sqlalchemy/__init__.py 2011-12-06 20:06:38 UTC (rev 123603)
@@ -14,5 +14,5 @@
__version__ = '0.7dev'
-from datamanager import ZopeTransactionExtension, mark_changed
+from zope.sqlalchemy.datamanager import ZopeTransactionExtension, mark_changed
invalidate = mark_changed
Modified: zope.sqlalchemy/trunk/src/zope/sqlalchemy/tests.py
===================================================================
--- zope.sqlalchemy/trunk/src/zope/sqlalchemy/tests.py 2011-12-06 19:57:42 UTC (rev 123602)
+++ zope.sqlalchemy/trunk/src/zope/sqlalchemy/tests.py 2011-12-06 20:06:38 UTC (rev 123603)
@@ -24,7 +24,22 @@
# NOTE: The sqlite that ships with Mac OS X 10.4 is buggy. Install a newer version (3.5.6)
# and rebuild pysqlite2 against it.
+import sys
+PY3 = sys.version_info[0] == 3
+
+def u(s):
+ if PY3:
+ return s
+ else:
+ return s.decode('utf-8')
+
+def b(s):
+ if PY3:
+ return s.encode('utf-8')
+ else:
+ return s
+
import os
import unittest
import transaction
@@ -128,7 +143,7 @@
if self.target is not None:
try:
result = self.target(*self.args, **self.kwargs)
- except Exception, e:
+ except Exception as e:
raise DummyTargetRaised(e)
raise DummyTargetResult(result)
else:
@@ -231,7 +246,7 @@
stmt = sql.select(test_users.columns).order_by('id')
conn = session.connection()
results = conn.execute(stmt)
- self.assertEqual(results.fetchall(), [(1, u'udo', u'juergens'), (2, u'heino', u'n/a')])
+ self.assertEqual(results.fetchall(), [(1, 'udo', 'juergens'), (2, 'heino', 'n/a')])
def testRelations(self):
session = Session()
@@ -244,17 +259,17 @@
def testTransactionJoining(self):
transaction.abort() # clean slate
t = transaction.get()
- self.failIf([r for r in t._resources if isinstance(r, tx.SessionDataManager)],
+ self.assertFalse([r for r in t._resources if isinstance(r, tx.SessionDataManager)],
"Joined transaction too early")
session = Session()
session.add(User(id=1, firstname='udo', lastname='juergens'))
t = transaction.get()
# Expect this to fail with SQLAlchemy 0.4
- self.failUnless([r for r in t._resources if isinstance(r, tx.SessionDataManager)],
+ self.assertTrue([r for r in t._resources if isinstance(r, tx.SessionDataManager)],
"Not joined transaction")
transaction.abort()
conn = Session().connection()
- self.failUnless([r for r in t._resources if isinstance(r, tx.SessionDataManager)],
+ self.assertTrue([r for r in t._resources if isinstance(r, tx.SessionDataManager)],
"Not joined transaction")
def testSavepoint(self):
@@ -262,7 +277,7 @@
t = transaction.get()
session = Session()
query = session.query(User)
- self.failIf(query.all(), "Users table should be empty")
+ self.assertFalse(query.all(), "Users table should be empty")
s0 = t.savepoint(optimistic=True) # this should always work
@@ -273,18 +288,18 @@
s1 = t.savepoint()
session.add(User(id=1, firstname='udo', lastname='juergens'))
session.flush()
- self.failUnless(len(query.all())==1, "Users table should have one row")
+ self.assertTrue(len(query.all())==1, "Users table should have one row")
s2 = t.savepoint()
session.add(User(id=2, firstname='heino', lastname='n/a'))
session.flush()
- self.failUnless(len(query.all())==2, "Users table should have two rows")
+ self.assertTrue(len(query.all())==2, "Users table should have two rows")
s2.rollback()
- self.failUnless(len(query.all())==1, "Users table should have one row")
+ self.assertTrue(len(query.all())==1, "Users table should have one row")
s1.rollback()
- self.failIf(query.all(), "Users table should be empty")
+ self.assertFalse(query.all(), "Users table should be empty")
def testRollbackAttributes(self):
use_savepoint = not engine.url.drivername in tx.NO_SAVEPOINT_SUPPORT
@@ -294,7 +309,7 @@
t = transaction.get()
session = Session()
query = session.query(User)
- self.failIf(query.all(), "Users table should be empty")
+ self.assertFalse(query.all(), "Users table should be empty")
s1 = t.savepoint()
user = User(id=1, firstname='udo', lastname='juergens')
@@ -402,9 +417,9 @@
result = None
try:
t.commit()
- except DummyTargetResult, e:
+ except DummyTargetResult as e:
result = e.args[0]
- except DummyTargetRaised, e:
+ except DummyTargetRaised as e:
raise e.args[0]
self.assertEqual(len(result), 1, "Should have been one prepared transaction when dummy aborted")
@@ -437,7 +452,7 @@
row1 = rows[0]
d = row1.asDict()
self.assertEqual(d, {'firstname' : 'udo', 'lastname' : 'juergens', 'id' : 1})
- except Exception, err:
+ except Exception as err:
global thread_error
thread_error = err
transaction.abort()
@@ -476,7 +491,6 @@
self.mappers = setup_mappers()
metadata.drop_all(engine)
metadata.create_all(engine)
-
self.tm1 = transaction.TransactionManager()
self.tm2 = transaction.TransactionManager()
# With psycopg2 you might supply isolation_level='SERIALIZABLE' here,
@@ -508,30 +522,30 @@
tm1, tm2, s1, s2 = self.tm1, self.tm2, self.s1, self.s2
# make sure we actually start a session.
tm1.begin()
- self.failUnless(len(s1.query(User).all())==1, "Users table should have one row")
+ self.assertTrue(len(s1.query(User).all())==1, "Users table should have one row")
tm2.begin()
- self.failUnless(len(s2.query(User).all())==1, "Users table should have one row")
+ self.assertTrue(len(s2.query(User).all())==1, "Users table should have one row")
s1.query(User).delete()
user = s2.query(User).get(1)
- user.lastname = u'smith'
+ user.lastname = u('smith')
tm1.commit()
raised = False
try:
s2.flush()
- except orm.exc.ConcurrentModificationError, e:
+ except orm.exc.ConcurrentModificationError as e:
# This error is thrown when the number of updated rows is not as expected
raised = True
- self.failUnless(raised, "Did not raise expected error")
- self.failUnless(tm2._retryable(type(e), e), "Error should be retryable")
+ self.assertTrue(tm2._retryable(type(e), e), "Error should be retryable")
+ self.assertTrue(raised, "Did not raise expected error")
def testRetryThread(self):
tm1, tm2, s1, s2 = self.tm1, self.tm2, self.s1, self.s2
# make sure we actually start a session.
tm1.begin()
- self.failUnless(len(s1.query(User).all())==1, "Users table should have one row")
+ self.assertTrue(len(s1.query(User).all())==1, "Users table should have one row")
tm2.begin()
s2.connection().execute("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE")
- self.failUnless(len(s2.query(User).all())==1, "Users table should have one row")
+ self.assertTrue(len(s2.query(User).all())==1, "Users table should have one row")
s1.query(User).delete()
raised = False
@@ -543,11 +557,12 @@
thread.start()
try:
user = s2.query(User).with_lockmode('update').get(1)
- except exc.DBAPIError, e:
+ except exc.DBAPIError as e:
# This error wraps the underlying DBAPI module error, some of which are retryable
raised = True
- self.failUnless(raised, "Did not raise expected error")
- self.failUnless(tm2._retryable(type(e), e), "Error should be retryable")
+ retryable = tm2._retryable(type(e), e)
+ self.assertTrue(retryable, "Error should be retryable")
+ self.assertTrue(raised, "Did not raise expected error")
thread.join() # well, we must have joined by now
More information about the checkins
mailing list