Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ee93730130c053f05728370f6a1d10458beff322)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ee93730130c053f05728370f6a1d10458beff322)
  • Date: Sun, 19 Sep 2010 06:52:35 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

python-pypi/bzr/DETAILS | 1 +
python-pypi/bzr/HISTORY | 6 ++++++
python-pypi/bzr/PRE_BUILD | 1 +
python-pypi/bzr/xmlrpclib.diff | 40
++++++++++++++++++++++++++++++++++++++++
4 files changed, 48 insertions(+)

New commits:
commit ee93730130c053f05728370f6a1d10458beff322
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

bzr - Fix traceback with python-2.7 xmlrpclib

diff --git a/python-pypi/bzr/DETAILS b/python-pypi/bzr/DETAILS
index 01c1fce..2e93f95 100755
--- a/python-pypi/bzr/DETAILS
+++ b/python-pypi/bzr/DETAILS
@@ -1,5 +1,6 @@
SPELL=bzr
VERSION=2.2.0
+ PATCHLEVEL=1
VX=`echo $VERSION|cut -c-3`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/python-pypi/bzr/HISTORY b/python-pypi/bzr/HISTORY
index 0906356..95a6441 100644
--- a/python-pypi/bzr/HISTORY
+++ b/python-pypi/bzr/HISTORY
@@ -1,3 +1,9 @@
+2010-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PREBUILD: apply patch
+ * xmlrpclib.diff: added, upstream patch
+ Fix traceback with python-2.7's xmlrpclib
+
2010-09-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.0

diff --git a/python-pypi/bzr/PRE_BUILD b/python-pypi/bzr/PRE_BUILD
index dd4b7ff..7793b2b 100755
--- a/python-pypi/bzr/PRE_BUILD
+++ b/python-pypi/bzr/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p0 <$SPELL_DIRECTORY/xmlrpclib.diff &&
sedit "s:man/man1:share/man/man1:" setup.py
diff --git a/python-pypi/bzr/xmlrpclib.diff b/python-pypi/bzr/xmlrpclib.diff
new file mode 100644
index 0000000..88e67e0
--- /dev/null
+++ b/python-pypi/bzr/xmlrpclib.diff
@@ -0,0 +1,40 @@
+=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
+--- bzrlib/transport/http/_urllib2_wrappers.py 2010-05-08 05:56:28 +0000
++++ bzrlib/transport/http/_urllib2_wrappers.py 2010-09-15 02:43:44 +0000
+@@ -75,6 +75,26 @@
+ )
+
+
++class addinfourl(urllib2.addinfourl):
++ '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
++
++ In python-2.7, xmlrpclib expects that the response object that it
receives
++ has a getheader method. httplib.HTTPResponse provides this but
++ urllib2.addinfourl does not. Add the necessary functions here, ported
to
++ use the internal data structures of addinfourl.
++ '''
++
++ def getheader(self, name, default=None):
++ if self.headers is None:
++ raise httplib.ResponseNotReady()
++ return self.headers.getheader(name, default)
++
++ def getheaders(self):
++ if self.headers is None:
++ raise httplib.ResponseNotReady()
++ return self.headers.items()
++
++
+ class _ReportingFileSocket(object):
+
+ def __init__(self, filesock, report_activity=None):
+@@ -656,7 +676,7 @@
+ r = response
+ r.recv = r.read
+ fp = socket._fileobject(r, bufsize=65536)
+- resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
++ resp = addinfourl(fp, r.msg, req.get_full_url())
+ resp.code = r.status
+ resp.msg = r.reason
+ resp.version = r.version
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ee93730130c053f05728370f6a1d10458beff322), Treeve Jelbert, 09/19/2010

Archive powered by MHonArc 2.6.24.

Top of Page