rpms/python-twisted-core/F-13 changeset_r25457.patch, 1.1, 1.2 python-twisted-core.spec, 1.15, 1.16

[Thomas Vander Stichele]

Author: thomasvs

Update of /cvs/pkgs/rpms/python-twisted-core/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19695

Modified Files:
	changeset_r25457.patch python-twisted-core.spec 
Log Message:
include missing hashlib.py to fix #583304

changeset_r25457.patch:
 TwistedCore-8.2.0.patched/twisted/internet/_sslverify.py        |    7 -
 TwistedCore-8.2.0.patched/twisted/internet/_sslverify.py.orig   |only
 TwistedCore-8.2.0.patched/twisted/internet/_sslverify.py.rej    |only
 TwistedCore-8.2.0.patched/twisted/protocols/sip.py              |   12 +-
 TwistedCore-8.2.0.patched/twisted/python/filepath.py            |    4 
 TwistedCore-8.2.0.patched/twisted/python/hashlib.py             |only
 TwistedCore-8.2.0.patched/twisted/python/otp.py                 |   57 ++++++----
 TwistedCore-8.2.0.patched/twisted/python/test/test_hashlib.py   |only
 TwistedCore-8.2.0.patched/twisted/python/test/test_zipstream.py |    6 -
 TwistedCore-8.2.0.patched/twisted/spread/pb.py                  |   12 +-
 TwistedCore-8.2.0.patched/twisted/trial/test/test_loader.py     |    4 
 twisted/python/hashlib.py                                       |   24 ++++
 12 files changed, 83 insertions(+), 43 deletions(-)

Index: changeset_r25457.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-twisted-core/F-13/changeset_r25457.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- changeset_r25457.patch	15 Apr 2010 11:35:09 -0000	1.1
+++ changeset_r25457.patch	18 Apr 2010 10:42:37 -0000	1.2
@@ -384,3 +384,32 @@ diff -aur TwistedCore-8.2.0/twisted/tria
              return d
          self.loadSortedPackages(sillySorter)
  
+
+diff -Naur TwistedCore-8.2.0/twisted/python/hashlib.py TwistedCore-8.2.0.patched/twisted/python/hashlib.py
+--- TwistedCore-8.2.0/twisted/python/hashlib.py	1970-01-01 01:00:00.000000000 +0100
++++ TwistedCore-8.2.0.patched/twisted/python/hashlib.py	2010-04-15 13:02:41.000000000 +0200
+@@ -0,0 +1,24 @@
++# -*- test-case-name: twisted.python.test.test_hashlib -*-
++# Copyright (c) 2008 Twisted Matrix Laboratories.
++# See LICENSE for details.
++
++"""
++L{twisted.python.hashlib} presents a subset of the interface provided by
++U{hashlib<http://docs.python.org/library/hashlib.html>}.  The subset is the
++interface required by various parts of Twisted.  This allows application code
++to transparently use APIs which existed before C{hashlib} was introduced or to
++use C{hashlib} if it is available.
++"""
++
++
++try:
++    _hashlib = __import__("hashlib")
++except ImportError:
++    from md5 import md5
++    from sha import sha as sha1
++else:
++    md5  = _hashlib.md5
++    sha1 = _hashlib.sha1
++
++
++__all__ = ["md5", "sha1"]


Index: python-twisted-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-twisted-core/F-13/python-twisted-core.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-twisted-core.spec	15 Apr 2010 11:35:09 -0000	1.15
+++ python-twisted-core.spec	18 Apr 2010 10:42:37 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           %{python}-twisted-core
 Version:        8.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Asynchronous networking framework written in Python
 Group:          Development/Libraries
 License:        MIT
@@ -194,6 +194,10 @@ fi
 %{_datadir}/zsh/site-functions/_twisted_zsh_stub
 
 %changelog
+* Sun Apr 18 2010 Thomas Vander Stichele <thomas at apestaart dot org>
+- 8.2.0-5
+- include the important missing hashlib.py to fix #583304
+
 * Thu Apr 15 2010 Thomas Vander Stichele <thomas at apestaart dot org>
 - 8.2.0-4
 - fix python 2.6 DeprecationWarning's