From 58da4e434d844da76226fdaceb6952532d68fb1e Mon Sep 17 00:00:00 2001
From: Jon Bergli Heier <snakebite@jvnv.net>
Date: Thu, 21 Oct 2010 19:15:11 +0200
Subject: Make code compatible with Python 3.x; should work with 2.6 and newer.

---
 pyanidb/__init__.py | 18 +++++++++---------
 pyanidb/hash.py     |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'pyanidb')

diff --git a/pyanidb/__init__.py b/pyanidb/__init__.py
index d570345..6a3f222 100644
--- a/pyanidb/__init__.py
+++ b/pyanidb/__init__.py
@@ -2,7 +2,7 @@ import socket, time
 
 protover = 3
 client = 'pyanidb'
-clientver = 6
+clientver = 7
 
 states = {
 	'unknown': 0,
@@ -25,7 +25,7 @@ acode = (
 	'short', 'synonym', 'category', '', '', '', '', '')
 
 info = fcode + acode
-info = dict([(info[i], 1L << i) for i in xrange(len(info)) if info[i]])
+info = dict([(info[i], 1 << i) for i in range(len(info)) if info[i]])
 
 class AniDBError(Exception):
 	pass
@@ -70,23 +70,23 @@ class AniDB:
 		self.sock.close()
 	
 	def newver_msg(self):
-		print 'New version available.'
+		print('New version available.')
 	
 	def retry_msg(self):
-		print 'Connection timed out, retrying.'
+		print('Connection timed out, retrying.')
 	
 	def execute(self, cmd, args = None, retry = False):
 		if not args:
 			args = {}
 		while 1:
-			data = '%s %s' % (cmd, '&'.join(['%s=%s' % a for a in args.iteritems()]))
+			data = '{0} {1}\n'.format(cmd, '&'.join(['{0}={1}'.format(*a) for a in args.items()]))
 			t = time.time()
 			if t < self.lasttime + 2:
 				time.sleep(self.lasttime + 2 - t)
 			self.lasttime = time.time()
-			self.sock.sendto(data + '\n', self.server)
+			self.sock.sendto(data.encode(), 0, self.server)
 			try:
-				data = self.sock.recv(8192).split('\n')
+				data = self.sock.recv(8192).decode().split('\n')
 			except socket.timeout:
 				if retry:
 					self.retry_msg()
@@ -132,9 +132,9 @@ class AniDB:
 		except TypeError:
 			args = {'fid': fid}
 		info_codes = list(info_codes)
-		info_codes.sort(lambda x, y: cmp(info[x], info[y]))
+		info_codes.sort(key = lambda x: info[x])
 		info_code = sum([info[code] for code in info_codes])
-		args.update({'s': self.session, 'fcode': info_code & 0xffffffffL, 'acode': info_code >> 32})
+		args.update({'s': self.session, 'fcode': info_code & 0xffffffff, 'acode': info_code >> 32})
 		while 1:
 			code, text, data = self.execute('FILE', args, retry)
 			if code == 220:
diff --git a/pyanidb/hash.py b/pyanidb/hash.py
index 912fc67..489f15a 100644
--- a/pyanidb/hash.py
+++ b/pyanidb/hash.py
@@ -35,7 +35,7 @@ class Crc32:
 		self.s = binascii.crc32(data, self.s)
 	
 	def hexdigest(self):
-		return '%08x' % (self.s & 0xffffffff)
+		return '{0:08x}'.format(self.s & 0xffffffff)
 
 hasher_obj = {
 	'ed2k': Ed2k,
@@ -52,7 +52,7 @@ class Hash:
 			update_list.append(h.update)
 			setattr(self, a, h.hexdigest)
 		
-		f = open(filename)
+		f = open(filename, 'rb')
 		data = f.read(131072)
 		while data:
 			for u in update_list:
@@ -80,7 +80,7 @@ class File:
 		cache = dict([(n[13:], xattr.getxattr(self.name, n)) for n in xattr.listxattr(self.name) if n.startswith('user.pyanidb.')])
 		if 'mtime' not in cache or str(int(self.mtime)) != cache.pop('mtime'):
 			return
-		for n, v in cache.iteritems():
+		for n, v in cache.items():
 			setattr(self, n, v)
 		self.cached = True
 	
@@ -119,7 +119,7 @@ class Hashthread(threading.Thread):
 def hash_files(files, cache = False, algorithms = ('ed2k',), num_threads = 1):
 	hashlist = []
 	threads = []
-	for x in xrange(num_threads):
+	for x in range(num_threads):
 		thread = Hashthread(files, hashlist, algorithms, cache)
 		thread.start()
 		threads.append(thread)
-- 
cgit v1.2.3