rpms/python-gdata/F-11 gdata-cryptomath_sha_deprecation.diff, NONE, 1.1 python-gdata.spec, 1.16, 1.17

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27987

Modified Files:
	python-gdata.spec 
Added Files:
	gdata-cryptomath_sha_deprecation.diff 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-2
- Fix deprecation warning (#492641)

gdata-cryptomath_sha_deprecation.diff:

--- NEW FILE gdata-cryptomath_sha_deprecation.diff ---
diff --git a/src/gdata/tlslite/utils/cryptomath.py b/src/gdata/tlslite/utils/cryptomath.py
index 51d6dff..67fb398 100755
--- a/src/gdata/tlslite/utils/cryptomath.py
+++ b/src/gdata/tlslite/utils/cryptomath.py
@@ -6,7 +6,7 @@ import os
 import math
 import base64
 import binascii
-import sha
+import hashlib
 
 from compat import *
 
@@ -195,7 +195,7 @@ def numBytes(n):
     return int(math.ceil(bits / 8.0))
 
 def hashAndBase64(s):
-    return stringToBase64(sha.sha(s).digest())
+    return stringToBase64(hashlib.sha1(s).digest())
 
 def getBase64Nonce(numChars=22): #defaults to an 132 bit nonce
     bytes = getRandomBytes(numChars)


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/F-11/python-gdata.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-gdata.spec	24 Apr 2009 00:55:53 -0000	1.16
+++ python-gdata.spec	29 Apr 2009 11:01:29 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           python-gdata
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python module for accessing online Google services
 
 Group:          Development/Languages
@@ -11,6 +11,9 @@ URL:            http://code.google.com/p
 Source0:        http://gdata-python-client.googlecode.com/files/gdata-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://code.google.com/p/gdata-python-client/issues/detail?id=236
+Patch0:         gdata-cryptomath_sha_deprecation.diff
+
 BuildArch:      noarch
 BuildRequires:  python-devel
 Requires:       python >= 2.5
@@ -27,6 +30,8 @@ This is a Python module for accessing on
 %prep
 %setup -q -n gdata-%{version}
 
+%patch0 -p1 -b .sha
+
 %build
 %{__python} setup.py build
 
@@ -48,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-2
+- Fix deprecation warning (#492641)
+
 * Fri Apr 24 2009 Bastien Nocera <bnocera at redhat.com> 1.3.1-1
 - Update to 1.3.1