[arch-commits] Commit in ubuntu-sso-client/trunk (PKGBUILD oauthlib-0.3.8.patch)

[Balló György]

    Date: Monday, May 20, 2013 @ 23:27:51
  Author: bgyorgy
Revision: 91297

upgpkg: ubuntu-sso-client 4.2.0-2

Apply upstream fix for oauthlib API change

Modified:
  ubuntu-sso-client/trunk/PKGBUILD
  ubuntu-sso-client/trunk/oauthlib-0.3.8.patch

----------------------+
 PKGBUILD             |    6 +++---
 oauthlib-0.3.8.patch |   39 +++++++++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-20 21:10:18 UTC (rev 91296)
+++ PKGBUILD	2013-05-20 21:27:51 UTC (rev 91297)
@@ -3,7 +3,7 @@
 
 pkgname=ubuntu-sso-client
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop service to allow applications to sign into Ubuntu services via SSO"
 arch=('any')
 url="https://launchpad.net/ubuntu-sso-client"
@@ -15,7 +15,7 @@
 source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
         oauthlib-0.3.8.patch)
 md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
-         'dfe190f84a8468cff995595fa38a6370')
+         '7eb0cf5ea1318ef5916b49f3c610aacd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -24,7 +24,7 @@
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
   # Fix error with oautlib>=0.3.8
-  patch -Np1 -i "$srcdir/oauthlib-0.3.8.patch"
+  patch -Np0 -i "$srcdir/oauthlib-0.3.8.patch"
 
   python2 setup.py build
 }

Modified: oauthlib-0.3.8.patch
===================================================================
--- oauthlib-0.3.8.patch	2013-05-20 21:10:18 UTC (rev 91296)
+++ oauthlib-0.3.8.patch	2013-05-20 21:27:51 UTC (rev 91297)
@@ -1,13 +1,40 @@
-diff -Naur ubuntu-sso-client-4.2.0.orig/ubuntu_sso/utils/webclient/common.py ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py
---- ubuntu-sso-client-4.2.0.orig/ubuntu_sso/utils/webclient/common.py	2013-04-02 00:10:25.870644798 +0000
-+++ ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py	2013-04-02 00:12:54.226165669 +0000
-@@ -158,8 +158,7 @@
+=== modified file 'ubuntu_sso/utils/webclient/common.py'
+--- ubuntu_sso/utils/webclient/common.py	2013-02-19 22:12:47 +0000
++++ ubuntu_sso/utils/webclient/common.py	2013-04-12 20:11:22 +0000
+@@ -157,9 +157,12 @@
+                                               else SIGNATURE_TYPE_AUTH_HEADER),
                                timestamp=str(timestamp))
  
-         url, signed_headers, body = oauth_client.sign(
+-        url, signed_headers, body = oauth_client.sign(
 -            uri, method, parameters if parameters is not None else {},
 -            {'Content-Type': 'application/x-www-form-urlencoded'})
-+            uri, method)
++        try:
++            url, signed_headers, body = oauth_client.sign(
++                uri, method, parameters if parameters is not None else {},
++                {'Content-Type': 'application/x-www-form-urlencoded'})
++        except ValueError:
++            url, signed_headers, body = oauth_client.sign(uri, method)
  
          return url, signed_headers, body
  
+
+=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
+--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2013-02-19 22:12:47 +0000
++++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2013-04-12 20:11:22 +0000
+@@ -794,15 +794,6 @@
+ 
+         self.assert_headers_correct(signed_headers)
+         self.assertEqual(url, self.sample_url)
+-        if params is not None:
+-            for param, value in params.items():
+-                self.assertIn(param, body)
+-                actual = body[param]
+-                self.assertEqual(value, actual)
+-
+-    def test_build_oauth_request_with_params(self):
+-        """Check that the oauth request are properly with params."""
+-        self.test_build_oauth_request(params=self.sample_params)
+ 
+     @defer.inlineCallbacks
+     def test_build_signed_iri(self, params=None):
+