[gentoo-commits] gentoo-x86 commit in net-nntp/hellanzb/files: hellanzb-0.13-python_26_fixes.patch hellanzb-0.13-twisted-10.0.0.patch

[Alexis Ballier (aballier)]

aballier    10/04/23 13:36:53

  Added:                hellanzb-0.13-python_26_fixes.patch
                        hellanzb-0.13-twisted-10.0.0.patch
  Log:
  Add patch for compat. with twisted 10.0.0, grabbed from debian, bug #316725 by Michael Farrell <micolous+gentoo@×××××.com>, pach to fix warnings with python 2.6, bug #262881 by rinus.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-nntp/hellanzb/files/hellanzb-0.13-python_26_fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nntp/hellanzb/files/hellanzb-0.13-python_26_fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nntp/hellanzb/files/hellanzb-0.13-python_26_fixes.patch?rev=1.1&content-type=text/plain

Index: hellanzb-0.13-python_26_fixes.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=262881

Index: Hellanzb/Growl.py
===================================================================
--- Hellanzb/Growl.py	(Revision 1094)
+++ Hellanzb/Growl.py	(Arbeitskopie)
@@ -7,7 +7,13 @@
 __contributors__ = "Ingmar J Stein (Growl Team)"
 
 import struct
-import md5
+
+# The md5 module has been deprecated as of Python 2.6.
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+
 from socket import AF_INET, SOCK_DGRAM, socket
 
 GROWL_UDP_PORT=9887
@@ -51,7 +57,7 @@
             self.data += encoded
         for default in self.defaults:
             self.data += struct.pack("B", default)
-        self.checksum = md5.new()
+        self.checksum = md5()
         self.checksum.update(self.data)
         if self.password:
             self.checksum.update(self.password)
@@ -89,7 +95,7 @@
         self.data += self.title
         self.data += self.description
         self.data += self.application
-        self.checksum = md5.new()
+        self.checksum = md5()
         self.checksum.update(self.data)
         if password:
             self.checksum.update(password)
Index: Hellanzb/Util.py
===================================================================
--- Hellanzb/Util.py	(Revision 1094)
+++ Hellanzb/Util.py	(Arbeitskopie)
@@ -28,9 +28,6 @@
 
 class FatalError(Exception):
     """ An error that will cause the program to exit """
-    def __init__(self, message):
-        self.args = [message]
-        self.message = message
 
 class EmptyForThisPool(Empty):
     """ The queue is empty in terms of our current serverPool, but there are still segments to
Index: Hellanzb/HellaXMLRPC/HtPasswdAuth.py
===================================================================
--- Hellanzb/HellaXMLRPC/HtPasswdAuth.py	(Revision 1094)
+++ Hellanzb/HellaXMLRPC/HtPasswdAuth.py	(Arbeitskopie)
@@ -8,7 +8,13 @@
 (c) Copyright 2005 Philip Jenvey
 [See end of file]
 """
-import md5
+
+# The md5 module has been deprecated as of Python 2.6.
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+
 from twisted.web import static
 from twisted.web.resource import Resource
 
@@ -70,7 +76,7 @@
         
         self.user = user
         
-        m = md5.new()
+        m = md5()
         m.update(password)
         del password
         self.passwordDigest = m.digest()
@@ -90,7 +96,7 @@
     def authenticateUser(self, request):
         username, password = request.getUser(), request.getPassword()
         
-        m = md5.new()
+        m = md5()
         m.update(password)
         
         authenticated = username == self.user and self.passwordDigest == m.digest()



1.1                  net-nntp/hellanzb/files/hellanzb-0.13-twisted-10.0.0.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nntp/hellanzb/files/hellanzb-0.13-twisted-10.0.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nntp/hellanzb/files/hellanzb-0.13-twisted-10.0.0.patch?rev=1.1&content-type=text/plain

Index: hellanzb-0.13-twisted-10.0.0.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=316725
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573221

--- xmlrpc.py	2010-03-10 18:29:19.000000000 -0600
+++ /usr/share/pyshared/Hellanzb/HellaXMLRPC/xmlrpc.py	2010-03-10 18:30:03.000000000 -0600
@@ -31,7 +31,7 @@
 from twisted.python import log, reflect
 
 import twisted.copyright
-if twisted.copyright.version >= '2.0.0':
+if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
     from twisted.web import http
 else:
     from twisted.protocols import http
--- HtPasswdAuth.py	2010-03-10 18:30:29.000000000 -0600
+++ /usr/share/pyshared/Hellanzb/HellaXMLRPC/HtPasswdAuth.py	2010-03-10 18:30:49.000000000 -0600
@@ -19,7 +19,7 @@
 from twisted.web.resource import Resource
 
 import twisted.copyright
-if twisted.copyright.version >= '2.0.0':
+if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
     from twisted.web import http
 else:
     from twisted.protocols import http
--- HellaReactor.py	2010-03-10 18:22:34.000000000 -0600
+++ /usr/share/pyshared/Hellanzb/HellaReactor.py	2010-03-10 18:30:07.000000000 -0600
@@ -9,7 +9,7 @@
 import Hellanzb, sys, time
 
 import twisted.copyright
-if twisted.copyright.version >= '2.0.0':
+if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
     from twisted.internet.selectreactor import SelectReactor
     from twisted.internet.selectreactor import _NO_FILENO
     from twisted.internet.selectreactor import _NO_FILEDESC