Replaced except X,Y: with except X as Y: as of PEP-3110 (#1137)

This will also get us closer to python3. See https://www.python.org/dev/peps/pep-3110/
Gallopsled · Apr 30, 2018 · 20cb049 · 20cb049
1 parent 3d03a75
commit 20cb049
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/dashbuild.py b/docs/dashbuild.py
@@ -44,7 +44,7 @@ def main(args):
 		doc2dash.__main__.main.main( \
 			[ os.path.join(dstdir, "html"), "-d", dstdir, "-n", name, \
 					"-f", "-I", "index.html"], "doc2dash", False)
-	except SystemExit,e:
+	except SystemExit as e:
 		pass
 
 	# Insert a link to the online version.

diff --git a/pwnlib/commandline/unhex.py b/pwnlib/commandline/unhex.py
@@ -24,7 +24,7 @@ def main(args):
             sys.stdout.write(s.decode('hex'))
         else:
             sys.stdout.write(''.join(args.hex).decode('hex'))
-    except TypeError, e:
+    except TypeError as e:
         sys.stderr.write(str(e) + '\n')
 
 if __name__ == '__main__':

diff --git a/pwnlib/tubes/process.py b/pwnlib/tubes/process.py
@@ -687,7 +687,7 @@ def recv_raw(self, numb):
 
         try:
             data = self.proc.stdout.read(numb)
-        except IOError as (err, strerror):
+        except IOError:
             pass
 
         if not data: