[Python-modules-commits] r26479 - in packages/python-cobe/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Saturday, November 23, 2013 @ 01:13:11
  Author: eriol-guest
Revision: 26479

Use python-irc instead of python-irclib

Added:
  packages/python-cobe/trunk/debian/patches/03_use_python-irc_instead_of_python-irclib.patch
Modified:
  packages/python-cobe/trunk/debian/changelog
  packages/python-cobe/trunk/debian/patches/series

Modified: packages/python-cobe/trunk/debian/changelog
===================================================================
--- packages/python-cobe/trunk/debian/changelog	2013-11-23 01:11:53 UTC (rev 26478)
+++ packages/python-cobe/trunk/debian/changelog	2013-11-23 01:13:11 UTC (rev 26479)
@@ -15,10 +15,12 @@
     - Refreshed
   * debian/patches/02_relaxed-versioned-dependencies.patch
     - Refreshed
+  * debian/patches/03_use_python-irc_instead_of_python-irclib.patch
+    - Use python-irc instead of python-irclib (Closes: #719113)
   * debian/watch
     - Switched download URL to https
 
- -- Daniele Tricoli <eriol at mornie.org>  Fri, 09 Aug 2013 18:01:37 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sat, 23 Nov 2013 02:11:46 +0100
 
 python-cobe (2.0.2-1) unstable; urgency=low
 

Added: packages/python-cobe/trunk/debian/patches/03_use_python-irc_instead_of_python-irclib.patch
===================================================================
--- packages/python-cobe/trunk/debian/patches/03_use_python-irc_instead_of_python-irclib.patch	                        (rev 0)
+++ packages/python-cobe/trunk/debian/patches/03_use_python-irc_instead_of_python-irclib.patch	2013-11-23 01:13:11 UTC (rev 26479)
@@ -0,0 +1,84 @@
+Description: Use python-irc instead of python-irclib
+Author: Daniele Tricoli <eriol at mornie.org>
+Last-Update: 2013-11-23
+
+--- a/cobe/irc.py
++++ b/cobe/irc.py
+@@ -1,16 +1,18 @@
+ # Copyright (C) 2010 Peter Teichman
+ 
+-import irclib
++from __future__ import absolute_import
++
++import irc.client
+ import logging
+ import re
+ 
+ log = logging.getLogger("cobe.irc")
+ 
+ 
+-class Bot(irclib.SimpleIRCClient):
++class Bot(irc.client.SimpleIRCClient):
+     def __init__(self, brain, nick, channel, log_channel, ignored_nicks,
+                  only_nicks):
+-        irclib.SimpleIRCClient.__init__(self)
++        irc.client.SimpleIRCClient.__init__(self)
+ 
+         self.brain = brain
+         self.nick = nick
+@@ -29,7 +31,7 @@
+     def _dispatcher(self, c, e):
+         log.debug("on_%s %s", e.eventtype(), (e.source(), e.target(),
+                                               e.arguments()))
+-        irclib.SimpleIRCClient._dispatcher(self, c, e)
++        irc.client.SimpleIRCClient._dispatcher(self, c, e)
+ 
+     def _delayed_check(self, delay=120):
+         self.connection.execute_delayed(delay, self._check_connection)
+@@ -46,7 +48,7 @@
+             conn.connect(conn.server, conn.port, conn.nickname, conn.password,
+                          conn.username, conn.ircname, conn.localaddress,
+                          conn.localport)
+-        except irclib.ServerConnectionError:
++        except irc.client.ServerConnectionError:
+             log.info("failed reconnection, rescheduling", exc_info=True)
+             self._delayed_check()
+ 
+@@ -61,7 +63,7 @@
+             self.connection.join(self.log_channel)
+ 
+     def on_pubmsg(self, conn, event):
+-        user = irclib.nm_to_n(event.source())
++        user = irc.client.NickMask(event.source()).nick
+ 
+         if event.target() == self.log_channel:
+             # ignore input in the log channel
+@@ -72,7 +74,7 @@
+             return
+ 
+         # only respond on channels
+-        if not irclib.is_channel(event.target()):
++        if not irc.client.is_channel(event.target()):
+             return
+ 
+         msg = event.arguments()[0]
+--- a/setup.py
++++ b/setup.py
+@@ -17,16 +17,7 @@
+ 
+     install_requires = [
+         "PyStemmer>=1.2.0",
+-        "python-irclib==0.4.8"
+-        ],
+-
+-    # The PyPI entry for python-irclib points at a SourceForge files
+-    # page. These no longer work with pip's url discovery, as they
+-    # append the string "/download" to each filename. I have uploaded
+-    # python-irclib 0.4.8's zip file from SourceForge (unmodified) to
+-    # the page below so that "pip install cobe" will work.
+-    dependency_links = [
+-        "http://github.com/pteichman/python-irclib/downloads"
++        "python-irc>=8.0.1"
+         ],
+ 
+     classifiers = [

Modified: packages/python-cobe/trunk/debian/patches/series
===================================================================
--- packages/python-cobe/trunk/debian/patches/series	2013-11-23 01:11:53 UTC (rev 26478)
+++ packages/python-cobe/trunk/debian/patches/series	2013-11-23 01:13:11 UTC (rev 26479)
@@ -1,2 +1,3 @@
 01_remove-argparse-from-install-requires.patch
 02_relaxed-versioned-dependencies.patch
+03_use_python-irc_instead_of_python-irclib.patch