rpms/supybot/F-11 supybot-0.83.4.1-json.patch, NONE, 1.1 supybot.spec, 1.9, 1.10

[Ricky Zhou (周家杰)]

Author: ricky

Update of /cvs/pkgs/rpms/supybot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28075

Modified Files:
	supybot.spec 
Added Files:
	supybot-0.83.4.1-json.patch 
Log Message:
* Wed Jun 03 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.4.1-1
- Upstream released new version.


supybot-0.83.4.1-json.patch:

--- NEW FILE supybot-0.83.4.1-json.patch ---
diff --git a/plugins/Google/plugin.py b/plugins/Google/plugin.py
index e1b6bee..98fd7dd 100644
--- a/plugins/Google/plugin.py
+++ b/plugins/Google/plugin.py
@@ -42,15 +42,21 @@ import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
 
+simplejson = None
+
+try:
+    simplejson = utils.python.universalImport('json')
+except ImportError:
+    pass
+
 try:
-    simplejson = utils.python.universalImport('json', 'simplejson',
-                                              'local.simplejson')
     # The 3rd party simplejson module was included in Python 2.6 and renamed to
     # json.  Unfortunately, this conflicts with the 3rd party json module.
     # Luckily, the 3rd party json module has a different interface so we test
     # to make sure we aren't using it.
-    if hasattr(simplejson, 'read'):
-        raise ImportError
+    if simplejson is None or hasattr(simplejson, 'read'):
+        simplejson = utils.python.universalImport('simplejson',
+                                                  'local.simplejson')
 except ImportError:
     raise callbacks.Error, \
             'You need Python2.6 or the simplejson module installed to use ' \


Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/F-11/supybot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- supybot.spec	19 May 2009 01:58:20 -0000	1.9
+++ supybot.spec	3 Jun 2009 08:46:04 -0000	1.10
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot
-Version:        0.83.4
+Version:        0.83.4.1
 Release:        1%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
@@ -12,6 +12,9 @@ Group:          Applications/Internet
 License:        BSD and GPLv2
 URL:            http://supybot.com
 Source0:        http://downloads.sourceforge.net/supybot/%{origname}-%{version}.tar.bz2
+# Fix a conflict between python-json and the built in json module
+# in Python 2.6.  Already submitted and commited upstream.
+Patch0:         %{name}-%{version}-json.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -33,6 +36,7 @@ to commands, as well as more than 50 bui
 
 %prep
 %setup -q -n %{origname}-%{version}
+%patch0 -p1
 
 
 %build
@@ -91,6 +95,9 @@ CFLAGS="%{optflags}" %{__python} -c 'imp
 
 
 %changelog
+* Wed Jun 03 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.4.1-1
+- Upstream released new version.
+
 * Mon May 18 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.4-1
 - Upstream released new version.