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
|
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 29 Mar 2012 14:50:56 +0200
Subject: [PATCH] 2to3: exception handling fixes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
arfile.py | 4 ++--
opkg-make-index | 4 ++--
opkg.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arfile.py b/arfile.py
index 9149387..3f797a8 100644
--- a/arfile.py
+++ b/arfile.py
@@ -54,11 +54,11 @@ class ArFile:
return FileSection(self.f, self.directory[fname][-1], int(self.directory[fname][5]))
if self.directoryRead:
- raise IOError, (2, "AR member not found: " + fname)
+ raise IOError("AR member not found: " + fname)
f = self._scan(fname)
if f == None:
- raise IOError, (2, "AR member not found: " + fname)
+ raise IOError("AR member not found: " + fname)
return f
diff --git a/opkg-make-index b/opkg-make-index
index 2fc8a69..997f286 100755
--- a/opkg-make-index
+++ b/opkg-make-index
@@ -198,10 +198,10 @@ names.sort()
for name in names:
try:
fnlist = packages[name].get_file_list()
- except OSError, e:
+ except OSError as e:
sys.stderr.write("Package %s disappeared on us!\n" % (name))
continue
- except IOError, e:
+ except IOError as e:
sys.stderr.write("Package %s disappeared on us!\n" % (name))
continue
for fn in fnlist:
diff --git a/opkg.py b/opkg.py
index 75ad3d3..ae31794 100644
--- a/opkg.py
+++ b/opkg.py
@@ -176,7 +176,7 @@ class Package:
elif name == 'size':
return self._get_file_size()
else:
- raise AttributeError, name
+ raise AttributeError(name)
def _computeFileMD5(self):
# compute the MD5.
|
