rpms/supybot/devel supybot-0.83.3-python2.6.patch, NONE, 1.1 supybot.spec, 1.5, 1.6

[Ricky Zhou (周家杰)]

Author: ricky

Update of /cvs/pkgs/rpms/supybot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11271

Modified Files:
	supybot.spec 
Added Files:
	supybot-0.83.3-python2.6.patch 
Log Message:
Backporting Python 2.6 fixes from Supybot git.


supybot-0.83.3-python2.6.patch:

--- NEW FILE supybot-0.83.3-python2.6.patch ---
diff -ur Supybot-0.83.3.orig/src/callbacks.py Supybot-0.83.3/src/callbacks.py
--- Supybot-0.83.3.orig/src/callbacks.py	2009-04-11 17:22:48.000000000 -0400
+++ Supybot-0.83.3/src/callbacks.py	2009-04-11 17:20:16.000000000 -0400
@@ -1051,7 +1051,7 @@
                 setattr(self, attr, cb)
                 self.cbs.append(cb)
                 cb.log = log.getPluginLogger('%s.%s' % (self.name(),cb.name()))
-        super(BasePlugin, self).__init__(*args, **kwargs)
+        super(BasePlugin, self).__init__()
 
 class SynchronizedAndFirewalled(log.MetaFirewall, utils.python.Synchronized):
     pass # Necessary for the metaclass compatibility issue.
diff -ur Supybot-0.83.3.orig/src/drivers/__init__.py Supybot-0.83.3/src/drivers/__init__.py
--- Supybot-0.83.3.orig/src/drivers/__init__.py	2009-04-11 17:22:48.000000000 -0400
+++ Supybot-0.83.3/src/drivers/__init__.py	2009-04-11 17:42:31.000000000 -0400
@@ -48,7 +48,6 @@
     """Base class for drivers."""
     def __init__(self, *args, **kwargs):
         add(self.name(), self)
-        super(IrcDriver, self).__init__(*args, **kwargs)
 
     def run(self):
         raise NotImplementedError
@@ -69,7 +68,7 @@
     def __init__(self, irc, servers=()):
         self.networkGroup = conf.supybot.networks.get(irc.network)
         self.servers = servers
-        super(ServersMixin, self).__init__(irc)
+        super(ServersMixin, self).__init__()
 
     def _getServers(self):
         # We do this, rather than utils.iter.cycle the servers in __init__,
diff -ur Supybot-0.83.3.orig/src/drivers/Socket.py Supybot-0.83.3/src/drivers/Socket.py
--- Supybot-0.83.3.orig/src/drivers/Socket.py	2009-04-11 17:22:48.000000000 -0400
+++ Supybot-0.83.3/src/drivers/Socket.py	2009-04-11 17:21:25.000000000 -0400
@@ -48,8 +48,8 @@
 class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
     def __init__(self, irc):
         self.irc = irc
-        self.__parent = super(SocketDriver, self)
-        self.__parent.__init__(irc)
+        drivers.IrcDriver.__init__(self, irc)
+        drivers.ServersMixin.__init__(self, irc)
         self.conn = None
         self.servers = ()
         self.eagains = 0
@@ -77,7 +77,7 @@
 
     def _getNextServer(self):
         oldServer = getattr(self, 'currentServer', None)
-        server = self.__parent._getNextServer()
+        server = drivers.ServersMixin._getNextServer(self)
         if self.currentServer != oldServer:
             self.resetDelay()
         return server


Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/supybot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- supybot.spec	26 Mar 2009 08:55:02 -0000	1.5
+++ supybot.spec	11 Apr 2009 22:18:59 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           supybot
 Version:        0.83.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -14,6 +14,11 @@
 Source0:        http://downloads.sourceforge.net/supybot/%{origname}-%{version}.tar.bz2
 # Disable the Google plugin
 Patch0:         %{name}-%{version}-plugins.patch
+# Backported upstream fixes for Python 2.6
+# All patches are from upstream git except for the first chunk in
+# Supybot-0.83.3/src/drivers/__init__.py, which I'm submitting
+# upstream.
+Patch1:         %{name}-%{version}-python2.6.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -40,6 +45,7 @@
 %prep
 %setup -q -n %{origname}-%{version}
 %patch0 -b .plugins
+%patch1 -p1 -b .python2.6
 
 
 %build
@@ -96,6 +102,9 @@
 
 
 %changelog
+* Sat Apr 11 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-10
+- Backporting Python 2.6 fixes from Supybot git.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.83.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild