diff options
author | Michał Górny <mgorny@gentoo.org> | 2017-03-18 09:21:53 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2017-03-18 10:09:38 +0100 |
commit | 32c88f7865c1ddf431fe99bfc6aa24c2c256babd (patch) | |
tree | 69f4e868f409791d4eae865c98eebf2cb726d02a /dev-python/pyzor/files | |
parent | net-print/xerox-drivers: fix LICENSE and restrict fetch/bindist (diff) | |
download | gentoo-32c88f7865c1ddf431fe99bfc6aa24c2c256babd.tar.gz gentoo-32c88f7865c1ddf431fe99bfc6aa24c2c256babd.tar.bz2 gentoo-32c88f7865c1ddf431fe99bfc6aa24c2c256babd.zip |
dev-python/pyzor: Remove old (distutils.eclass)
Diffstat (limited to 'dev-python/pyzor/files')
-rw-r--r-- | dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch | 89 | ||||
-rw-r--r-- | dev-python/pyzor/files/pyzord_getopt.patch | 24 |
2 files changed, 0 insertions, 113 deletions
diff --git a/dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch b/dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch deleted file mode 100644 index 671b994b3a2f..000000000000 --- a/dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch +++ /dev/null @@ -1,89 +0,0 @@ -# Description: Fix python2.6 deprecation warnings -# Origin: Ubuntu -# Author: Alessio Treglia <quadrispro@ubuntu.com> -# Bug-Ubuntu: https://bugs.launchpad.net/bugs/394775 -diff -Nur -x '*.orig' -x '*~' pyzor-0.5.0/lib/pyzor/client.py pyzor-0.5.0.new/lib/pyzor/client.py ---- pyzor-0.5.0/lib/pyzor/client.py 2009-04-29 22:53:50.000000000 +0200 -+++ pyzor-0.5.0.new/lib/pyzor/client.py 2009-08-01 12:27:55.749263645 +0200 -@@ -10,7 +10,7 @@ - import tempfile - import mimetools - import multifile --import sha -+import hashlib - - import pyzor - from pyzor import * -@@ -402,12 +402,12 @@ - del p2 - - saltfile = open(randfile) -- salt = saltfile.read(sha.digest_size) -+ salt = saltfile.read(hashlib.sha1().digest_size) - del saltfile - -- salt_digest = sha.new(salt) -+ salt_digest = hashlib.sha1(salt) - -- pass_digest = sha.new() -+ pass_digest = hashlib.sha1() - pass_digest.update(salt_digest.digest()) - pass_digest.update(p1) - sys.stdout.write("salt,key:\n") -@@ -498,7 +498,7 @@ - if len(offsets) == 0: - return - -- self._digest = sha.new() -+ self._digest = hashlib.sha1() - - if len(offsets) <= self.atomic_num_lines: - self.handle_atomic(fp) -diff -Nur -x '*.orig' -x '*~' pyzor-0.5.0/lib/pyzor/__init__.py pyzor-0.5.0.new/lib/pyzor/__init__.py ---- pyzor-0.5.0/lib/pyzor/__init__.py 2009-04-29 22:53:50.000000000 +0200 -+++ pyzor-0.5.0.new/lib/pyzor/__init__.py 2009-08-01 12:28:20.268413580 +0200 -@@ -8,7 +8,7 @@ - import os.path - import re - import sys --import sha -+import hashlib - import tempfile - import random - import ConfigParser -@@ -114,7 +114,7 @@ - - class DataDigest(str): - # hex output doubles digest size -- value_size = sha.digest_size * 2 -+ value_size = hashlib.sha1().digest_size * 2 - - def __init__(self, value): - if len(value) != self.value_size: -@@ -285,7 +285,7 @@ - """returns a digest object""" - typecheck(msg, Message) - -- return sha.new(str(msg)) -+ return hashlib.sha1(str(msg)) - - hash_msg = staticmethod(hash_msg) - -@@ -295,7 +295,7 @@ - typecheck(key, long) - typecheck(user, Username) - -- return sha.new("%s:%x" % (Username, key)).hexdigest().lower() -+ return hashlib.sha1("%s:%x" % (Username, key)).hexdigest().lower() - - hash_key = staticmethod(hash_key) - -@@ -316,7 +316,7 @@ - - h_msg = self.hash_msg(msg) - -- return sha.new("%s:%d:%s" % (h_msg.digest(), ts, hashed_key)).hexdigest().lower() -+ return hashlib.sha1("%s:%d:%s" % (h_msg.digest(), ts, hashed_key)).hexdigest().lower() - - sign_msg = classmethod(sign_msg) - diff --git a/dev-python/pyzor/files/pyzord_getopt.patch b/dev-python/pyzor/files/pyzord_getopt.patch deleted file mode 100644 index 42b6fe4339f6..000000000000 --- a/dev-python/pyzor/files/pyzord_getopt.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- scripts/pyzord.orig 2002-09-08 06:33:44.000000000 +0300 -+++ scripts/pyzord 2007-07-06 01:31:06.000000000 +0300 -@@ -52,7 +52,11 @@ - # functions above, run below - - debug = 0 --(options, args) = getopt.getopt(sys.argv[1:], 'dh:', ['homedir=']) -+try: -+ (options, args) = getopt.getopt(sys.argv[1:], 'hd', ['help','homedir=']) -+except getopt.GetoptError, err: -+ print str(err) -+ usage() - if len(args) != 0: - usage() - -@@ -61,7 +65,7 @@ - for (o, v) in options: - if o == '-d': - debug = 1 -- elif o == '-h': -+ elif o in ('-h', '--help'): - usage() - elif o == '--homedir': - specified_homedir = v |