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

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

    Date: Friday, May 1, 2015 @ 14:42:51
  Author: eriol-guest
Revision: 32513

Remove 03_use_python-irc_instead_of_python-irclib.patch since fixed upstream

Modified:
  packages/python-cobe/trunk/debian/changelog
  packages/python-cobe/trunk/debian/patches/series
Deleted:
  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/changelog	2015-05-01 14:32:00 UTC (rev 32512)
+++ packages/python-cobe/trunk/debian/changelog	2015-05-01 14:42:51 UTC (rev 32513)
@@ -5,10 +5,12 @@
     - Refresh.
   * debian/patches/02_relaxed-versioned-dependencies.patch
     - Refresh.
+  * debian/patches/03_use_python-irc_instead_of_python-irclib.patch
+    - Remove since fixed upstream.
   * debian/watch
     - Use pypi.debian.net redirector.
 
- -- Daniele Tricoli <eriol at mornie.org>  Fri, 01 May 2015 16:23:04 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 01 May 2015 16:41:31 +0200
 
 python-cobe (2.1.0-2) unstable; urgency=medium
 

Deleted: 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	2015-05-01 14:32:00 UTC (rev 32512)
+++ packages/python-cobe/trunk/debian/patches/03_use_python-irc_instead_of_python-irclib.patch	2015-05-01 14:42:51 UTC (rev 32513)
@@ -1,90 +0,0 @@
-Description: Use python-irc instead of python-irclib
- python-irc is not listed in install_requires because right now
- pkg_resources.get_distribution('irc').version will give something
- like '0.0.08.3.1'
-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
-@@ -27,9 +29,9 @@
-             logging.root.addHandler(handler)
- 
-     def _dispatcher(self, c, e):
--        log.debug("on_%s %s", e.eventtype(), (e.source(), e.target(),
--                                              e.arguments()))
--        irclib.SimpleIRCClient._dispatcher(self, c, e)
-+        log.debug("on_%s %s", e.type, (e.source, e.target,
-+                                       e.arguments))
-+        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,6 @@
- 
-     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"
-         ],
- 
-     classifiers = [

Modified: packages/python-cobe/trunk/debian/patches/series
===================================================================
--- packages/python-cobe/trunk/debian/patches/series	2015-05-01 14:32:00 UTC (rev 32512)
+++ packages/python-cobe/trunk/debian/patches/series	2015-05-01 14:42:51 UTC (rev 32513)
@@ -1,4 +1,3 @@
 01_remove-argparse-from-install-requires.patch
 02_relaxed-versioned-dependencies.patch
-03_use_python-irc_instead_of_python-irclib.patch
 04_fix-irc-client.patch