[Checkins] SVN: z3c.sqlalchemy/trunk/ compatibility fixes
Andreas Jung
andreas at andreas-jung.com
Tue Aug 4 02:08:50 EDT 2009
Log message for revision 102474:
compatibility fixes
Changed:
U z3c.sqlalchemy/trunk/CHANGES.txt
U z3c.sqlalchemy/trunk/setup.py
U z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py
U z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py
-=-
Modified: z3c.sqlalchemy/trunk/CHANGES.txt
===================================================================
--- z3c.sqlalchemy/trunk/CHANGES.txt 2009-08-03 22:16:19 UTC (rev 102473)
+++ z3c.sqlalchemy/trunk/CHANGES.txt 2009-08-04 06:08:49 UTC (rev 102474)
@@ -1,3 +1,9 @@
+1.4.0 (04.08.2009)
+------------------
+
+- removed compatibility code with older Zope versions
+- fixed import issue with modern zope.component versions
+
1.3.9 (06.01.2009)
------------------
Modified: z3c.sqlalchemy/trunk/setup.py
===================================================================
--- z3c.sqlalchemy/trunk/setup.py 2009-08-03 22:16:19 UTC (rev 102473)
+++ z3c.sqlalchemy/trunk/setup.py 2009-08-04 06:08:49 UTC (rev 102474)
@@ -21,7 +21,7 @@
'Topic :: Software Development :: Libraries :: Python Modules',
]
-version = '1.3.9'
+version = '1.4.0'
desc = open('README.txt').read().strip()
changes = open('CHANGES.txt').read().strip()
Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py 2009-08-03 22:16:19 UTC (rev 102473)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py 2009-08-04 06:08:49 UTC (rev 102474)
@@ -15,6 +15,7 @@
import os
import sqlalchemy
+import unittest
from sqlalchemy import MetaData, Integer, String, Column, Table
from sqlalchemy.ext.declarative import declarative_base
@@ -28,10 +29,9 @@
from z3c.sqlalchemy.postgres import ZopePostgresWrapper
from z3c.sqlalchemy.mapper import MappedClassBase
from z3c.sqlalchemy import createSAWrapper, Model, registerSAWrapper, getSAWrapper
-from Testing.ZopeTestCase import ZopeTestCase
-class WrapperTests(ZopeTestCase):
+class WrapperTests(unittest.TestCase):
def setUp(self):
@@ -46,7 +46,6 @@
skill = Table('skills', metadata,
Column('user_id', Integer, primary_key=True),
- Column('user_id', Integer),
Column('name', String(255)))
metadata.drop_all()
@@ -69,8 +68,8 @@
rows = session.query(User).all()
self.assertEqual(len(rows), 0)
- session.save(User(id=1, firstname='udo', lastname='juergens'))
- session.save(User(id=2, firstname='heino', lastname='n/a'))
+ session.add(User(id=1, firstname='udo', lastname='juergens'))
+ session.add(User(id=2, firstname='heino', lastname='n/a'))
session.flush()
rows = session.query(User).order_by(User.c.id).all()
@@ -167,7 +166,7 @@
db = createSAWrapper(self.dsn, model=getModel)
User = db.getMapper('users')
session = db.session
- session.save(User(id=1,firstname='foo', lastname='bar'))
+ session.add(User(id=1,firstname='foo', lastname='bar'))
session.flush()
user = session.query(User).filter_by(firstname='foo')[0]
Skill = user.getMapper('skills')
@@ -189,8 +188,8 @@
User = db.getMapper('users')
session = db.session
- session.save(User(id=1, firstname='udo', lastname='juergens'))
- session.save(User(id=2, firstname='heino', lastname='n/a'))
+ session.add(User(id=1, firstname='udo', lastname='juergens'))
+ session.add(User(id=2, firstname='heino', lastname='n/a'))
session.flush()
conn = db.connection
@@ -215,8 +214,8 @@
Base.metadata.create_all(db._engine)
- session.save(Foo(id=1, name='Andreas Jung'))
- session.save(Foo(id=2, name='Peter Becker'))
+ session.add(Foo(id=1, name='Andreas Jung'))
+ session.add(Foo(id=2, name='Peter Becker'))
session.flush()
rows = session.query(Foo).all()
@@ -243,8 +242,8 @@
session = db.session
Foo = db.getMapper('foo')
- session.save(Foo(id=1, name='Andreas Jung'))
- session.save(Foo(id=2, name='Peter Becker'))
+ session.add(Foo(id=1, name='Andreas Jung'))
+ session.add(Foo(id=2, name='Peter Becker'))
session.flush()
rows = session.query(Foo).all()
Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py 2009-08-03 22:16:19 UTC (rev 102473)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py 2009-08-04 06:08:49 UTC (rev 102474)
@@ -15,7 +15,7 @@
from sqlalchemy.engine.url import make_url
from zope.component import getUtilitiesFor, getUtility
-from zope.component.interfaces import IUtilityService, ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from z3c.sqlalchemy.interfaces import ISQLAlchemyWrapper
from z3c.sqlalchemy.postgres import ZopePostgresWrapper
@@ -94,27 +94,10 @@
(never call this method directly)
"""
- try:
- # Zope 2.9
- from zope.component import provideUtility
- provideUtility(wrapper, name=name)
- except ImportError:
- # Zope 2.8
- from zope.component import getService, getGlobalServices, getUtilitiesFor
- from zope.component.utility import GlobalUtilityService
- from zope.component.interfaces import IUtilityService
- from zope.component.servicenames import Utilities
- sm = getGlobalServices()
- try:
- utilityService = getService(Utilities)
- except ComponentLookupError:
- sm.defineService(Utilities, IUtilityService)
- sm.provideService(Utilities, GlobalUtilityService())
- utilityService = getService(Utilities)
+ from zope.component import provideUtility
+ provideUtility(wrapper, name=name)
- utilityService.provideUtility(ISQLAlchemyWrapper, wrapper, name)
-
def getSAWrapper(name):
""" return a SQLAlchemyWrapper instance by name """
More information about the Checkins
mailing list