[python-webhelpers] Apply a patch to fix an error with WebOb 1.2.3 (#914418, #993178)

Luke Macken lmacken at fedoraproject.org
Tue Aug 13 05:03:09 UTC 2013


commit 4de69a9667e1034c27bde0e590a51030626fc365
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Aug 13 01:02:31 2013 -0400

    Apply a patch to fix an error with WebOb 1.2.3 (#914418, #993178)

 WebOb-1.2.3.patch      |   25 +++++++++++++++++++++++++
 python-webhelpers.spec |    9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/WebOb-1.2.3.patch b/WebOb-1.2.3.patch
new file mode 100644
index 0000000..20b0d8d
--- /dev/null
+++ b/WebOb-1.2.3.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Mike Orr <sluggoster at gmail.com>
+# Date 1365359657 25200
+#      Sun Apr 07 11:34:17 2013 -0700
+# Branch trunk
+# Node ID 9ad434bec9a16c06c1cfeed38cde02f00a95685d
+# Parent  9574054a6b15e91143743bec0bd0274fc592d0aa
+# Parent  69ce4f780c4332d137499bdc2f60676e50dbb27a
+Merged in aodag/webhelpers (pull request #1)
+
+fix error on webob 1.2.3
+
+diff -r 9574054a6b15 -r 9ad434bec9a1 webhelpers/mimehelper.py
+--- a/webhelpers/mimehelper.py	Sun Apr 07 11:33:59 2013 -0700
++++ b/webhelpers/mimehelper.py	Sun Apr 07 11:34:17 2013 -0700
+@@ -110,8 +110,7 @@
+             if '.' in last_part:
+                 has_extension = True
+         if 'HTTP_ACCEPT' in self.env:
+-            possible_from_accept_header = webob.acceptparse.MIMEAccept('ACCEPT', 
+-                self.env['HTTP_ACCEPT'])
++            possible_from_accept_header = webob.acceptparse.MIMEAccept(self.env['HTTP_ACCEPT'])
+         if has_extension == False:
+             if possible_from_accept_header is None:
+                 return self._set_response_content_type(content_type)
diff --git a/python-webhelpers.spec b/python-webhelpers.spec
index b799c74..0796911 100644
--- a/python-webhelpers.spec
+++ b/python-webhelpers.spec
@@ -2,7 +2,7 @@
 
 Name: python-webhelpers
 Version: 1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Helper library for aiding the writing of web templates in Python
 
 Group: Development/Languages
@@ -17,6 +17,9 @@ Source0: http://pypi.python.org/packages/source/W/WebHelpers/WebHelpers-%{versio
 # (rhbz#715831)
 Patch1: disable-failing-date-test.patch
 
+# https://bitbucket.org/bbangert/webhelpers/pull-request/1
+Patch2: WebOb-1.2.3.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-setuptools-devel
@@ -37,6 +40,7 @@ to accommodate for Python.
 %setup -q -n WebHelpers-%{version}
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -62,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 13 2013 Luke Macken <lmacken at redhat.com> - 1.3-7
+- Apply a patch to fix an error with WebOb 1.2.3 (#914418, #993178)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list