1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
Description: Use python-six instead of embedded copy
Author: Sebastian Ramacher <sramacher@debian.org>
Last-Update: 2013-12-09
--- python-ecdsa-0.10.orig/ecdsa/der.py
+++ python-ecdsa-0.10/ecdsa/der.py
@@ -2,7 +2,7 @@ from __future__ import division
import binascii
import base64
-from .six import int2byte, b, PY3, integer_types, text_type
+from six import int2byte, b, PY3, integer_types, text_type
class UnexpectedDER(Exception):
pass
--- python-ecdsa-0.10.orig/ecdsa/ecdsa.py
+++ python-ecdsa-0.10/ecdsa/ecdsa.py
@@ -53,7 +53,7 @@ Revision history:
Written in 2005 by Peter Pearson and placed in the public domain.
"""
-from .six import int2byte, b, print_
+from six import int2byte, b, print_
from . import ellipticcurve
from . import numbertheory
import random
--- python-ecdsa-0.10.orig/ecdsa/ellipticcurve.py
+++ python-ecdsa-0.10/ecdsa/ellipticcurve.py
@@ -34,7 +34,7 @@
from __future__ import division
-from .six import print_
+from six import print_
from . import numbertheory
class CurveFp( object ):
--- python-ecdsa-0.10.orig/ecdsa/keys.py
+++ python-ecdsa-0.10/ecdsa/keys.py
@@ -7,7 +7,7 @@ from .curves import NIST192p, find_curve
from .util import string_to_number, number_to_string, randrange
from .util import sigencode_string, sigdecode_string
from .util import oid_ecPublicKey, encoded_oid_ecPublicKey
-from .six import PY3, b
+from six import PY3, b
from hashlib import sha1
class BadSignatureError(Exception):
--- python-ecdsa-0.10.orig/ecdsa/numbertheory.py
+++ python-ecdsa-0.10/ecdsa/numbertheory.py
@@ -11,8 +11,8 @@
from __future__ import division
-from .six import print_, integer_types
-from .six.moves import reduce
+from six import print_, integer_types
+from six.moves import reduce
import math
import types
--- python-ecdsa-0.10.orig/ecdsa/rfc6979.py
+++ python-ecdsa-0.10/ecdsa/rfc6979.py
@@ -12,7 +12,7 @@ Many thanks to Coda Hale for his impleme
import hmac
from binascii import hexlify
from .util import number_to_string, number_to_string_crop
-from .six import b
+from six import b
try:
bin(0)
--- python-ecdsa-0.10.orig/ecdsa/test_pyecdsa.py
+++ python-ecdsa-0.10/ecdsa/test_pyecdsa.py
@@ -8,7 +8,7 @@ import subprocess
from binascii import hexlify, unhexlify
from hashlib import sha1, sha256, sha512
-from .six import b, print_, binary_type
+from six import b, print_, binary_type
from .keys import SigningKey, VerifyingKey
from .keys import BadSignatureError
from . import util
--- python-ecdsa-0.10.orig/ecdsa/util.py
+++ python-ecdsa-0.10/ecdsa/util.py
@@ -6,7 +6,7 @@ import binascii
from hashlib import sha256
from . import der
from .curves import orderlen
-from .six import PY3, int2byte, b, next
+from six import PY3, int2byte, b, next
# RFC5480:
# The "unrestricted" algorithm identifier is:
--- python-ecdsa-0.10.orig/setup.py
+++ python-ecdsa-0.10/setup.py
@@ -2,7 +2,7 @@
import os, subprocess, re
from distutils.core import setup, Command
from distutils.command.sdist import sdist as _sdist
-from ecdsa.six import print_
+from six import print_
class Test(Command):
description = "run unit tests"
|
