[gentoo-commits] gentoo-x86 commit in net-im/pymsn-t/files: pymsn-t-initd pymsn-t-0.11.3-use-non-deprecated-hashlib.patch

[Hanno Boeck (hanno)]

hanno       11/09/04 10:26:35

  Added:                pymsn-t-initd
                        pymsn-t-0.11.3-use-non-deprecated-hashlib.patch
  Log:
  pymsn-t: fix deprecations in python and init-script, port to eapi 3
  
  (Portage version: 2.1.10.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-im/pymsn-t/files/pymsn-t-initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pymsn-t/files/pymsn-t-initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pymsn-t/files/pymsn-t-initd?rev=1.1&content-type=text/plain

Index: pymsn-t-initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/files/pymsn-t-initd,v 1.1 2011/09/04 10:26:35 hanno Exp $

depend() {
	need net
	use jabber-server
}

start() {
	ebegin "Starting MSN Jabber Transport"
	start-stop-daemon --start --pidfile /var/run/jabber/pymsn-t.pid -u jabber -g jabber \
		--exec /usr/bin/python INSPATH/pymsn-t.py -- \
		-b -c /etc/jabber/pymsn-t.xml -l /var/log/jabber/pymsn-t.log
	eend $?
}

stop() {
	ebegin "Stopping MSN Jabber Transport"
	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid
	eend $?
}



1.1                  net-im/pymsn-t/files/pymsn-t-0.11.3-use-non-deprecated-hashlib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pymsn-t/files/pymsn-t-0.11.3-use-non-deprecated-hashlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pymsn-t/files/pymsn-t-0.11.3-use-non-deprecated-hashlib.patch?rev=1.1&content-type=text/plain

Index: pymsn-t-0.11.3-use-non-deprecated-hashlib.patch
===================================================================
From 87d6eac62671152c318ea2cb839a748b06723ee2 Mon Sep 17 00:00:00 2001
From: Matthew W. S. Bell <matthew@×××××××××××.uk>
Date: Sat, 12 Feb 2011 19:44:18 +0000
Subject: [PATCH 2/4] Use newer (non-deprecataed) hashlib module, if available.

---
 src/avatar.py               |    9 +++++++--
 src/legacy/msn/msn.py       |   11 +++++++----
 src/legacy/msn/msnp11chl.py |    8 ++++++--
 src/utils.py                |   12 ++++++------
 src/xdb.py                  |    8 ++++++--
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/avatar.py b/src/avatar.py
index b9f7dfc..3aa0a3c 100644
--- a/src/avatar.py
+++ b/src/avatar.py
@@ -6,7 +6,12 @@ from debug import LogEvent, INFO, WARN, ERROR
 from twisted.internet import reactor
 from twisted.words.xish.domish import Element
 
-import sha, base64, os, os.path
+import base64, os, os.path
+
+try:
+	from hashlib import sha1
+except ImportError:
+	from sha import sha as sha1
 
 import utils
 import config
@@ -34,7 +39,7 @@ def parsePhotoEl(photo):
 class Avatar:
 	""" Represents an Avatar. Does not store the image in memory. """
 	def __init__(self, imageData, avatarCache):
-		self.__imageHash = sha.sha(imageData).hexdigest()
+		self.__imageHash = sha1(imageData).hexdigest()
 		self.__avatarCache = avatarCache
 
 	def getImageHash(self):
diff --git a/src/legacy/msn/msn.py b/src/legacy/msn/msn.py
index cd36aa8..e27e973 100644
--- a/src/legacy/msn/msn.py
+++ b/src/legacy/msn/msn.py
@@ -106,9 +106,12 @@ from twisted.words.xish.domish import parseText, unescapeFromXml
 
 
 # System imports
-import types, operator, os, sys, base64, random, struct, random, sha, base64, StringIO, array, codecs, binascii
+import types, operator, os, sys, base64, random, struct, random, base64, StringIO, array, codecs, binascii
 from urllib import quote, unquote
-
+try:
+	from hashlib import sha1
+except ImportError:
+	from sha import sha as sha1
 
 MSN_PROTOCOL_VERSION = "MSNP11"      # protocol version
 MSN_PORT             = 1863               # default dispatch server port
@@ -490,7 +493,7 @@ class MSNObject:
         self.type = 3
         self.location = "TMP" + str(random.randint(1000,9999))
         self.friendly = "AAA="
-        self.sha1d = b64enc(sha.sha(imageData).digest())
+        self.sha1d = b64enc(sha1(imageData).digest())
         self.makeText()
     
     def setNull(self):
@@ -518,7 +521,7 @@ class MSNObject:
         h.append(self.friendly)
         h.append("SHA1D")
         h.append(self.sha1d)
-        sha1c = b64enc(sha.sha("".join(h)).digest())
+        sha1c = b64enc(sha1("".join(h)).digest())
         self.text = '<msnobj Creator="%s" Size="%s" Type="%s" Location="%s" Friendly="%s" SHA1D="%s" SHA1C="%s"/>' % (self.creator, str(self.size), str(self.type), self.location, self.friendly, self.sha1d, sha1c)
     
     def parse(self, s):
diff --git a/src/legacy/msn/msnp11chl.py b/src/legacy/msn/msnp11chl.py
index bbf4c4d..9368df0 100644
--- a/src/legacy/msn/msnp11chl.py
+++ b/src/legacy/msn/msnp11chl.py
@@ -1,16 +1,20 @@
 # Copyright 2005 James Bunton <james@××××××××.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
-import md5
 import struct
 
+try:
+	from hashlib import md5
+except ImportError:
+	from md5 import md5
+
 MSNP11_PRODUCT_ID = "PROD0090YUAUV{2B"
 MSNP11_PRODUCT_KEY = "YMM8C_H7KCQ2S_KL"
 MSNP11_MAGIC_NUM = 0x0E79A9C1
 
 
 def doChallenge(chlData):
-	md5digest = md5.md5(chlData + MSNP11_PRODUCT_KEY).digest()
+	md5digest = md5(chlData + MSNP11_PRODUCT_KEY).digest()
 
 	# Make array of md5 string ints
 	md5Ints = struct.unpack("<llll", md5digest)
diff --git a/src/utils.py b/src/utils.py
index cb73ea3..88110ae 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,17 +1,17 @@
 # Copyright 2004-2005 James Bunton <james@××××××××.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
+try:
+	from hashlib import sha1
+except ImportError:
+	from sha import sha as sha1
 
+def socks5Hash(sid, initiator, target):
+	return sha1("%s%s%s" % (sid, initiator, target)).hexdigest()
 
 def getLang(el):
 	return el.getAttribute((u'http://www.w3.org/XML/1998/namespace', u'lang'))
 
-
-import sha
-def socks5Hash(sid, initiator, target):
-	return sha.new("%s%s%s" % (sid, initiator, target)).hexdigest()
-
-
 import urllib
 import os.path
 def getURLBits(url, assumedType=None):
diff --git a/src/xdb.py b/src/xdb.py
index a3e3b5d..bd48582 100644
--- a/src/xdb.py
+++ b/src/xdb.py
@@ -6,9 +6,13 @@ from debug import LogEvent, INFO, WARN
 import os
 import os.path
 import shutil
-import md5
 import config
 
+try:
+	from hashlib import md5
+except ImportError:
+	from md5 import md5
+
 X = os.path.sep
 SPOOL_UMASK = 0077
 
@@ -23,7 +27,7 @@ def mangle(file):
 	return file.replace("@", "%")
 
 def makeHash(file):
-	return md5.md5(file).hexdigest()[0:3]
+	return md5(file).hexdigest()[0:3]
 
 
 class XDB:
-- 
1.7.2.3