From da46b54d5df4fbc33c3d7da51554aaa5ba469318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Mon, 1 Dec 2008 22:08:11 +0000 Subject: [PATCH] - Update to 0.5.0rc4 which works with the new pysqlite - And update test cases to work with the new pysqlite --- python-sqlalchemy.spec | 6 ++++-- sqlalchemy-sqlite-unicode-test.patch | 30 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 sqlalchemy-sqlite-unicode-test.patch diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec index 78a27dd..907158c 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -13,6 +13,7 @@ Group: Development/Libraries License: MIT URL: http://www.sqlalchemy.org/ Source0: http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}%{?alphatag}.tar.gz +Patch0: sqlalchemy-sqlite-unicode-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -30,7 +31,7 @@ domain. %prep %setup -q -n %{srcname}-%{version}%{?alphatag} - +%patch0 -p1 -b .unicode %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build @@ -58,7 +59,8 @@ python test/alltests.py %changelog * Mon Dec 1 2008 Toshio Kuratomi - 0.5-0.1.rc4 -- Update to 0.5.0rc4 which works with the new pysqlite. +- Update to 0.5.0rc4 which works with the new pysqlite +- And update test cases to work with the new pysqlite * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.4.7-2 - Rebuild for Python 2.6 diff --git a/sqlalchemy-sqlite-unicode-test.patch b/sqlalchemy-sqlite-unicode-test.patch new file mode 100644 index 0000000..dbfdf4e --- /dev/null +++ b/sqlalchemy-sqlite-unicode-test.patch @@ -0,0 +1,30 @@ +diff -up SQLAlchemy-0.5.0rc4/test/sql/testtypes.py.unicode SQLAlchemy-0.5.0rc4/test/sql/testtypes.py +--- SQLAlchemy-0.5.0rc4/test/sql/testtypes.py.unicode 2008-12-01 13:36:48.000000000 -0800 ++++ SQLAlchemy-0.5.0rc4/test/sql/testtypes.py 2008-12-01 13:38:21.000000000 -0800 +@@ -294,7 +294,7 @@ class UnicodeTest(TestBase, AssertsExecu + unicodedata = rawdata.decode('utf-8') + unicode_table.insert().execute(unicode_varchar=unicodedata, + unicode_text=unicodedata, +- plain_varchar=rawdata) ++ plain_varchar=unicodedata) + x = unicode_table.select().execute().fetchone() + self.assert_(isinstance(x['unicode_varchar'], unicode) and x['unicode_varchar'] == unicodedata) + self.assert_(isinstance(x['unicode_text'], unicode) and x['unicode_text'] == unicodedata) +@@ -313,7 +313,7 @@ class UnicodeTest(TestBase, AssertsExecu + unicodedata = rawdata.decode('utf-8') + unicode_table.insert().execute(unicode_varchar=unicodedata, + unicode_text=unicodedata, +- plain_varchar=rawdata) ++ plain_varchar=unicodedata) + + x = union(select([unicode_table.c.unicode_varchar]), select([unicode_table.c.unicode_varchar])).execute().fetchone() + self.assert_(isinstance(x['unicode_varchar'], unicode) and x['unicode_varchar'] == unicodedata) +@@ -360,7 +360,7 @@ class UnicodeTest(TestBase, AssertsExecu + unicodedata = rawdata.decode('utf-8') + unicode_table.insert().execute(unicode_varchar=unicodedata, + unicode_text=unicodedata, +- plain_varchar=rawdata) ++ plain_varchar=unicodedata) + x = unicode_table.select().execute().fetchone() + print 0, repr(unicodedata) + print 1, repr(x['unicode_varchar'])