[arch-commits] Commit in python-irc/trunk (PKGBUILD jaraco.py)

[Kyle Keen]

    Date: Wednesday, May 21, 2014 @ 03:04:25
  Author: kkeen
Revision: 111613

upgpkg: python-irc 8.9.1-1

Added:
  python-irc/trunk/jaraco.py
Modified:
  python-irc/trunk/PKGBUILD

-----------+
 PKGBUILD  |   16 ++++++++++++----
 jaraco.py |   16 ++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-21 00:35:26 UTC (rev 111612)
+++ PKGBUILD	2014-05-21 01:04:25 UTC (rev 111613)
@@ -6,8 +6,8 @@
 
 pkgbase=python-irc
 pkgname=('python-irc' 'python2-irc')
-pkgver=8.5.4
-pkgrel=2
+pkgver=8.9.1
+pkgrel=1
 pkgdesc="IRC (Internet Relay Chat) protocol client library for Python"
 depends=('python-six')
 makedepends=('python-setuptools' 'python2-setuptools')
@@ -16,11 +16,19 @@
 url="http://pypi.python.org/pypi/irc"
 license=('LGPL')
 install='python-irc.install'
-source=(http://pypi.python.org/packages/source/i/irc/irc-$pkgver.zip)
-md5sums=('5d9456d8861ef409252a6184adba2617')
+source=(http://pypi.python.org/packages/source/i/irc/irc-$pkgver.zip
+        jaraco.py)
+md5sums=('b19439f713a33d13585302e15c45bc26'
+         '90a2ebb75d5b5263ea8f688f024a93d5')
 
 build() {
   cd "$srcdir"
+  # todo, convince author not to use his own misc lib
+  cp jaraco.py "irc-$pkgver/irc/"
+  pushd "irc-$pkgver"
+  sed -i 's/jaraco.util.itertools/irc.jaraco/' irc/client.py
+  sed -i '25i irc/jaraco.py' irc.egg-info/SOURCES.txt
+  popd
   cp -a "irc-$pkgver" "irc2-$pkgver"
 }
 

Added: jaraco.py
===================================================================
--- jaraco.py	                        (rev 0)
+++ jaraco.py	2014-05-21 01:04:25 UTC (rev 111613)
@@ -0,0 +1,16 @@
+"""
+Sometimes parts of https://pypi.python.org/pypi/jaraco.util
+leak into the python-irc package.  Instead of making a whole
+new package for these util functions, let's embed them
+instead.  Reconsider this when there is more than a dozen
+lines of code.
+"""
+
+def always_iterable(item):
+    "taken from jaraco.util-10.0.2"
+    if item is None:
+        item = ()
+    if isinstance(item, six.string_types) or not hasattr(item, '__iter__'):
+        item = (item,)
+    return item
+