[Python-modules-commits] r10415 - in packages/urlgrabber/trunk/debian (8 files)

Fri Nov 13 11:34:16 UTC 2009

Date: Friday, November 13, 2009 @ 11:34:15
  Author: jwilk-guest
Revision: 10415

Integrate 3.1.0-4.

Added:
  packages/urlgrabber/trunk/debian/patches/
  packages/urlgrabber/trunk/debian/patches/001_keepalive.dpatch
  packages/urlgrabber/trunk/debian/patches/00list
Modified:
  packages/urlgrabber/trunk/debian/README.Debian
  packages/urlgrabber/trunk/debian/changelog
  packages/urlgrabber/trunk/debian/control
  packages/urlgrabber/trunk/debian/copyright
  packages/urlgrabber/trunk/debian/rules

Modified: packages/urlgrabber/trunk/debian/README.Debian
===================================================================

--- packages/urlgrabber/trunk/debian/README.Debian	2009-11-13 11:32:18 UTC (rev 10414)
+++ packages/urlgrabber/trunk/debian/README.Debian	2009-11-13 11:34:15 UTC (rev 10415)
@@ -4,4 +4,4 @@
 The files keepalive.py and byterange.py are generic urllib2 extension modules
 and can be used to add keepalive and range support to any urllib2 application.
 
- -- Kevin Coyner <kevin at rustybear.com>  Fri,  6 Apr 2007 22:01:01 -0400
+ -- Kevin Coyner <kcoyner at debian.org>  Fri,  6 Apr 2007 22:01:01 -0400

Modified: packages/urlgrabber/trunk/debian/changelog
===================================================================
--- packages/urlgrabber/trunk/debian/changelog	2009-11-13 11:32:18 UTC (rev 10414)
+++ packages/urlgrabber/trunk/debian/changelog	2009-11-13 11:34:15 UTC (rev 10415)
@@ -1,3 +1,13 @@
+urlgrabber (3.1.0-4) unstable; urgency=low
+
+  * Patch to have urlgrabber.keepalive.HTTPHandler use Request.get_method() to
+    determine the appropriate HTTP method. Thanks to Jakub Wilk.
+    Closes: #433724
+  * Changed maintainer e-mail to reflect new Debian account.
+  * Added dpatch as Build-Depends to debian/control.
+
+ -- Kevin Coyner <kcoyner at debian.org>  Sat, 04 Aug 2007 21:52:14 -0400
+
 urlgrabber (3.1.0-3) unstable; urgency=low
 
   * debian/control: Added python modules packaging team to uploaders and added

Modified: packages/urlgrabber/trunk/debian/control
===================================================================
--- packages/urlgrabber/trunk/debian/control	2009-11-13 11:32:18 UTC (rev 10414)
+++ packages/urlgrabber/trunk/debian/control	2009-11-13 11:34:15 UTC (rev 10415)
@@ -1,9 +1,9 @@
 Source: urlgrabber
 Section: python
 Priority: optional
-Maintainer: Kevin Coyner <kevin at rustybear.com>
+Maintainer: Kevin Coyner <kcoyner at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), python-all-dev (>= 2.3.5-11), python-support (>= 0.6)
+Build-Depends: debhelper (>= 5), python-all-dev (>= 2.3.5-11), python-support (>= 0.6), dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/urlgrabber/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/urlgrabber/trunk/?op=log

Modified: packages/urlgrabber/trunk/debian/copyright
===================================================================
--- packages/urlgrabber/trunk/debian/copyright	2009-11-13 11:32:18 UTC (rev 10414)
+++ packages/urlgrabber/trunk/debian/copyright	2009-11-13 11:34:15 UTC (rev 10415)
@@ -28,5 +28,5 @@
 On Debian systems, the complete text of the GNU Lesser General Public License
 can be found in `/usr/share/common-licenses/LGPL'.
 
-The Debian packaging is (C) 2007, Kevin Coyner <kevin at rustybear.com> and is
+The Debian packaging is (C) 2007, Kevin Coyner <kcoyner at debian.org> and is
 licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Added: packages/urlgrabber/trunk/debian/patches/001_keepalive.dpatch
===================================================================
--- packages/urlgrabber/trunk/debian/patches/001_keepalive.dpatch	                        (rev 0)
+++ packages/urlgrabber/trunk/debian/patches/001_keepalive.dpatch	2009-11-13 11:34:15 UTC (rev 10415)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 001_keepalive.dpatch by Kevin Coyner <kcoyner at debian.org>
+##
+## DP: keepalive patch
+## DP: Original patch provided by Jakub Wilk <ubanus at users.sf.net>
+
+ at DPATCH@
+diff -urNad urlgrabber-3.1.0~/urlgrabber/keepalive.py urlgrabber-3.1.0/urlgrabber/keepalive.py
+--- urlgrabber-3.1.0~/urlgrabber/keepalive.py	2006-09-21 20:58:05.000000000 -0400
++++ urlgrabber-3.1.0/urlgrabber/keepalive.py	2007-08-04 22:18:34.000000000 -0400
+@@ -302,16 +302,14 @@
+ 
+     def _start_transaction(self, h, req):
+         try:
++            h.putrequest(req.get_method(), req.get_selector())
+             if req.has_data():
+                 data = req.get_data()
+-                h.putrequest('POST', req.get_selector())
+                 if not req.headers.has_key('Content-type'):
+                     h.putheader('Content-type',
+                                 'application/x-www-form-urlencoded')
+                 if not req.headers.has_key('Content-length'):
+                     h.putheader('Content-length', '%d' % len(data))
+-            else:
+-                h.putrequest('GET', req.get_selector())
+         except (socket.error, httplib.HTTPException), err:
+             raise urllib2.URLError(err)
+ 
+@@ -371,9 +369,9 @@
+ 
+     def __init__(self, sock, debuglevel=0, strict=0, method=None):
+         if method: # the httplib in python 2.3 uses the method arg
+-            httplib.HTTPResponse.__init__(self, sock, debuglevel, method)
++            httplib.HTTPResponse.__init__(self, sock, debuglevel, strict, method)
+         else: # 2.2 doesn't
+-            httplib.HTTPResponse.__init__(self, sock, debuglevel)
++            httplib.HTTPResponse.__init__(self, sock, debuglevel, strict)
+         self.fileno = sock.fileno
+         self.code = None
+         self._rbuf = ''

Added: packages/urlgrabber/trunk/debian/patches/00list
===================================================================
--- packages/urlgrabber/trunk/debian/patches/00list	                        (rev 0)
+++ packages/urlgrabber/trunk/debian/patches/00list	2009-11-13 11:34:15 UTC (rev 10415)
@@ -0,0 +1 @@
+001_keepalive

Modified: packages/urlgrabber/trunk/debian/rules
===================================================================
--- packages/urlgrabber/trunk/debian/rules	2009-11-13 11:32:18 UTC (rev 10414)
+++ packages/urlgrabber/trunk/debian/rules	2009-11-13 11:34:15 UTC (rev 10415)
@@ -24,7 +24,7 @@
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp: configure-stamp
 	dh_testdir
@@ -34,7 +34,9 @@
 	done
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
 	dh_testdir
 	dh_testroot
 	-rm -f build-stamp configure-stamp
@@ -45,6 +47,15 @@
 	find $(CURDIR) -name "*.pyc" -exec rm -f '{}' \;
 	dh_clean
 
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 install: build
 	dh_testdir
 	dh_testroot


