From edb7cf637c4188f01f7d5649423156aa4b8e2923 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 29 Jul 2014 16:47:21 +0200
Subject: [PATCH] work around failing types test

https://bitbucket.org/zzzeek/sqlalchemy/issue/3144
---
 python-sqlalchemy-0.9.7-types-test-workaround.patch | 12 ++++++++++++
 python-sqlalchemy.spec                              |  4 ++++
 2 files changed, 16 insertions(+)
 create mode 100644 python-sqlalchemy-0.9.7-types-test-workaround.patch

diff --git a/python-sqlalchemy-0.9.7-types-test-workaround.patch b/python-sqlalchemy-0.9.7-types-test-workaround.patch
new file mode 100644
index 0000000..fe52d58
--- /dev/null
+++ b/python-sqlalchemy-0.9.7-types-test-workaround.patch
@@ -0,0 +1,12 @@
+diff -up SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py.types-test-workaround SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py
+--- SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py.types-test-workaround	2014-07-22 22:54:20.000000000 +0200
++++ SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py	2014-07-29 16:43:27.921221412 +0200
+@@ -3268,7 +3268,7 @@ class _defer_name(_truncated_label):
+     generation.
+ 
+     """
+-    def __new__(cls, value):
++    def __new__(cls, value, *rest):
+         if value is None:
+             return _NONE_NAME
+         elif isinstance(value, conv):
diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec
index d008b60..6063527 100644
--- a/python-sqlalchemy.spec
+++ b/python-sqlalchemy.spec
@@ -19,6 +19,9 @@ License:        MIT
 URL:            http://www.sqlalchemy.org/
 Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 Patch0:         python-sqlalchemy-0.9.7-nose-use-build.patch
+# Work around failing types test
+# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144
+Patch1:         python-sqlalchemy-%{version}-types-test-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python2-devel >= 2.6
@@ -66,6 +69,7 @@ This package includes the python 3 version of the module.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .nose-use-build
+%patch1 -p1 -b .types-test-workaround
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}