rpms/MySQL-python/devel escape-fix.patch, NONE, 1.1 MySQL-python.spec, 1.33, 1.34

[Tom Lane (tgl)]

Author: tgl

Update of /cvs/pkgs/rpms/MySQL-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7934

Modified Files:
	MySQL-python.spec 
Added Files:
	escape-fix.patch 
Log Message:
Fix broken escape() method

escape-fix.patch:

--- NEW FILE escape-fix.patch ---
Fix incorrect fix to a prior bug, which broke Connection.escape() method.
Per bug #331021.  See also upstream report at
http://sourceforge.net/tracker/index.php?func=detail&aid=1774101&group_id=22307&atid=374932


diff -Naur MySQL-python-1.2.2.orig/MySQLdb/connections.py MySQL-python-1.2.2/MySQLdb/connections.py
--- MySQL-python-1.2.2.orig/MySQLdb/connections.py	2007-02-24 19:10:53.000000000 -0500
+++ MySQL-python-1.2.2/MySQLdb/connections.py	2008-06-19 22:21:16.000000000 -0400
@@ -140,11 +140,10 @@
 
         conv2 = {}
         for k, v in conv.items():
-            if isinstance(k, int):
-                if isinstance(v, list):
-                    conv2[k] = v[:]
-                else:
-                    conv2[k] = v
+            if isinstance(k, int) and isinstance(v, list):
+                conv2[k] = v[:]
+            else:
+                conv2[k] = v
         kwargs2['conv'] = conv2
 
         self.cursorclass = kwargs2.pop('cursorclass', self.default_cursor)


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MySQL-python.spec	20 Feb 2008 03:49:01 -0000	1.33
+++ MySQL-python.spec	20 Jun 2008 02:31:00 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
@@ -11,6 +11,7 @@
 # script from 1.2.1_p2 for now.
 Source1: setup.py
 Patch1: sitecfg.patch
+Patch2: escape-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python mx mysql
@@ -40,6 +41,7 @@
 cp -f %{SOURCE1} setup.py
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -f doc/*~
@@ -65,6 +67,10 @@
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Thu Jun 19 2008 Tom Lane <tgl at redhat.com> 1.2.2-7
+- Fix broken escape() method
+Resolves: #331021
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.2-6
 - Autorebuild for GCC 4.3