summaryrefslogtreecommitdiff
path: root/libre/mc/mc-python3.patch
blob: 8b74e0d1bf33afbd547f3f2c09de948cc425b038 (plain)
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
diff -up mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 mc-4.8.24/src/vfs/extfs/helpers/uc1541
--- mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3	2020-01-20 14:40:30.637996501 +0100
+++ mc-4.8.24/src/vfs/extfs/helpers/uc1541	2020-01-20 14:37:55.253442507 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 UC1541 Virtual filesystem
 
--- a/src/vfs/extfs/helpers/s3+.in	(original)
+++ b/src/vfs/extfs/helpers/s3+.in	(refactored)
@@ -153,16 +153,16 @@
 	Propagates exception safely.
 	"""
 	from threading import Thread
-	import Queue
+	import queue
 
 	items = list(iterable)
 	nitems = len(items)
 	if nitems < 2:
-		return map(fun, items)
+		return list(map(fun, items))
 
 	# Create and fill input queue
-	input = Queue.Queue()
-	output = Queue.Queue()
+	input = queue.Queue()
+	output = queue.Queue()
 
 	for i,item in enumerate(items):
 		input.put( (i,item) )
@@ -181,7 +181,7 @@
 						output.put( (i,result) )
 					except:
 						output.put( (None,sys.exc_info()) )
-				except Queue.Empty:
+				except queue.Empty:
 					return
 
 	# Start threads
@@ -196,8 +196,8 @@
 		try:
 			i,res = output.get()
 			if i == None:
-				raise res[0],res[1],res[2]
-		except Queue.Empty:
+				raise res[0](res[1]).with_traceback(res[2])
+		except queue.Empty:
 			break
 		ret.append(res)
 
@@ -241,7 +241,7 @@
 		b = s3.get_bucket(name, validate=False)
 		b.get_location() # just to raise an exception on error
 		return b
-	except boto.exception.S3ResponseError, e:
+	except boto.exception.S3ResponseError as e:
 		# Seems this is the only proper way to switch to the bucket's region.
 		# Requesting of the default region for "?location" does not work unfortunately.
 		m = re.search(r'<Region>(.*?)</Region>', e.body)
@@ -340,7 +340,7 @@
 	expr = re.compile(r'^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.\d{3}Z$')
 	def convDate(awsdatetime):
 		m = expr.match(awsdatetime)
-		ye,mo,da,ho,mi,se = map(int,m.groups())
+		ye,mo,da,ho,mi,se = list(map(int,m.groups()))
 
 		dt = datetime.datetime(ye,mo,da,ho,mi,se, tzinfo=pytz.utc)
 		return dt.astimezone(tz).strftime('%m-%d-%Y %H:%M')