summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2012-06-18 17:15:02 +0200
committerSybren A. Stüvel <sybren@stuvel.eu>2012-06-18 17:15:02 +0200
commita40ed47668b31893c2f859a4d8698207723652c1 (patch)
tree97e0f99f4438a8f3e9d07cc31d46aa985fbfd252
parent7a583b573492dab4e9ebe7e5b2d6ce87d6edf55d (diff)
downloadrsa-git-version-3.1.1.tar.gz
Fixed some more Py32 incompatibilitiesversion-3.1.1
-rw-r--r--rsa/_version200.py4
-rw-r--r--rsa/parallel.py8
2 files changed, 7 insertions, 5 deletions
diff --git a/rsa/_version200.py b/rsa/_version200.py
index a49f635..f915653 100644
--- a/rsa/_version200.py
+++ b/rsa/_version200.py
@@ -106,7 +106,7 @@ def to64(number):
if number == 63: # 63 translates to '_' (underscore)
return byte(95)
- raise ValueError(u'Invalid Base64 value: %i' % number)
+ raise ValueError('Invalid Base64 value: %i' % number)
def from64(number):
@@ -135,7 +135,7 @@ def from64(number):
if number == 95: #ord('_') translates to 63
return(63)
- raise ValueError(u'Invalid Base64 value: %i' % number)
+ raise ValueError('Invalid Base64 value: %i' % number)
def int2str64(number):
diff --git a/rsa/parallel.py b/rsa/parallel.py
index d164067..e5034ac 100644
--- a/rsa/parallel.py
+++ b/rsa/parallel.py
@@ -24,6 +24,8 @@ Introduced in Python-RSA 3.1.
'''
+from __future__ import print_function
+
import multiprocessing as mp
import rsa.prime
@@ -77,7 +79,7 @@ __all__ = ['getprime']
if __name__ == '__main__':
- print 'Running doctests 1000x or until failure'
+ print('Running doctests 1000x or until failure')
import doctest
for count in range(100):
@@ -86,7 +88,7 @@ if __name__ == '__main__':
break
if count and count % 10 == 0:
- print '%i times' % count
+ print('%i times' % count)
- print 'Doctests done'
+ print('Doctests done')