rpms/python-sqlobject/devel python-sqlobject-deprecation.patch, NONE, 1.1 python-sqlobject.spec, 1.23, 1.24

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlobject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27038

Modified Files:
	python-sqlobject.spec 
Added Files:
	python-sqlobject-deprecation.patch 
Log Message:

* Fri Jan 8 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10.2-5
- Fix deprecation warnings https://bugzilla.redhat.com/show_bug.cgi?id=552463


python-sqlobject-deprecation.patch:
 converters.py |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE python-sqlobject-deprecation.patch ---
diff -up SQLObject-0.10.2/sqlobject/converters.py.mine SQLObject-0.10.2/sqlobject/converters.py
--- SQLObject-0.10.2/sqlobject/converters.py.mine	2010-01-08 20:40:19.830139020 -0500
+++ SQLObject-0.10.2/sqlobject/converters.py	2010-01-08 20:41:06.582138269 -0500
@@ -157,17 +157,16 @@ registerConverter(dict, SequenceConverte
 try:
     set, frozenset
 except NameError:
-    pass
+    try:
+        from sets import Set, ImmutableSet
+    except ImportError:
+        pass
+    else:
+        registerConverter(Set, SequenceConverter)
+        registerConverter(ImmutableSet, SequenceConverter)
 else:
     registerConverter(set, SequenceConverter)
     registerConverter(frozenset, SequenceConverter)
-try:
-    from sets import Set, ImmutableSet
-except ImportError:
-    pass
-else:
-    registerConverter(Set, SequenceConverter)
-    registerConverter(ImmutableSet, SequenceConverter)
 
 if hasattr(time, 'struct_time'):
     def StructTimeConverter(value, db):


Index: python-sqlobject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/python-sqlobject.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-sqlobject.spec	26 Jul 2009 23:09:01 -0000	1.23
+++ python-sqlobject.spec	9 Jan 2010 02:00:54 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           python-sqlobject
 Version:        0.10.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SQLObject -Object-Relational Manager, aka database wrapper  
 
 Group:          Development/Libraries
@@ -10,6 +10,7 @@ License:        LGPLv2+
 URL:            http://sqlobject.org/
 Source0:        http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-%{version}.tar.gz  
 Patch0:         %{name}-%{version}-setup.patch
+Patch1:         %{name}-deprecation.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
@@ -31,6 +32,7 @@ installed separately.
 %prep
 %setup -q -n SQLObject-%{version}
 %patch0 -b .setup
+%patch1 -p1 -b .depr
 
 %build
 %{__python} setup.py build
@@ -38,7 +40,7 @@ chmod 0644 docs/rebuild
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 
 %clean
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Fri Jan 8 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10.2-5
+- Fix deprecation warnings https://bugzilla.redhat.com/show_bug.cgi?id=552463
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild