From: Oleg Broytman <phd@phdru.name>
Date: Sat, 13 May 2017 16:20:21 +0000 (+0300)
Subject: Feat(Python3): `except Error, value` -> `except Error as value`
X-Git-Tag: 5.0.0~122
X-Git-Url: https://git.phdru.name/?p=bookmarks_db.git;a=commitdiff_plain;h=97202bf84e9c78d8fac912a82a85fb1cbb233a4b

Feat(Python3): `except Error, value` -> `except Error as value`
---

diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py
index eb69c28..8dd032b 100644
--- a/Robots/bkmk_robot_base.py
+++ b/Robots/bkmk_robot_base.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['robot_base', 'get_error']
@@ -200,7 +200,7 @@ class robot_base(Robot):
                            pass # float timeout
                         self.set_redirect(bookmark, "html", "%s (%s sec)" % (url, timeout))
 
-            except KeyError, key:
+            except KeyError as key:
                self.log("   no header: %s" % key)
 
       except EOFError:
@@ -211,7 +211,7 @@ class robot_base(Robot):
          self.log("Keyboard interrupt (^C)")
          return 0
 
-      except socket.error, e:
+      except socket.error as e:
          bookmark.error = get_error(e)
          self.log(bookmark.error)
 
diff --git a/Robots/bkmk_rurllib.py b/Robots/bkmk_rurllib.py
index b41722f..6f15ad5 100644
--- a/Robots/bkmk_rurllib.py
+++ b/Robots/bkmk_rurllib.py
@@ -99,10 +99,10 @@ class robot_urllib(robot_base):
 
          return None, None, None, headers, content
 
-      except RedirectException, e:
+      except RedirectException as e:
          return None, e.errcode, e.newurl, None, None
 
-      except IOError, e:
+      except IOError as e:
          if (e[0] == "http error") and (e[1] == -1):
             error = None
             bookmark.no_error = "The server did not return any header - it is not an error, actually"
diff --git a/Robots/bkmk_rurllib2.py b/Robots/bkmk_rurllib2.py
index d9c9149..a5714a1 100644
--- a/Robots/bkmk_rurllib2.py
+++ b/Robots/bkmk_rurllib2.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2014-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['robot_urllib2']
@@ -63,23 +63,23 @@ class robot_urllib2(robot_base):
         try:
             response = urllib2.urlopen(request)
 
-        except urllib2.HTTPError, e:
+        except urllib2.HTTPError as e:
             if e.code in (301, 302, 303, 307):
                 return None, e.code, e.hdrs['Location'], None, None
             else:
                 self.log('   HTTP Error %s: %s' % (e.code, e.msg))
                 return "HTTP Error %s: %s" % (e.code, e.msg), None, None, None, None
 
-        except urllib2.URLError, e:
+        except urllib2.URLError as e:
             self.log('   URL Error: %s' % e.reason)
             return "URL Error: %s" % e.reason, None, None, None, None
 
-        except httplib.HTTPException, e:
+        except httplib.HTTPException as e:
             error = get_error(e)
             self.log('   HTTP Exception: %s' % error)
             return "HTTP Exception: %s" % error, None, None, None, None
 
-        except IOError, e:
+        except IOError as e:
             error = get_error(e)
             self.log('   I/O Error: %s' % error)
             return "I/O Error: %s" % error, None, None, None, None
diff --git a/subproc.py b/subproc.py
index a0099c2..3507ac1 100644
--- a/subproc.py
+++ b/subproc.py
@@ -115,7 +115,7 @@ class Subprocess:
                 os.execvp(cmd[0], cmd)
                 os._exit(1)                     # Shouldn't get here
 
-            except os.error, e:
+            except os.error as e:
                 if self.control_stderr:
                     os.dup2(parentErr, 2)       # Reconnect to parent's stdout
                 sys.stderr.write("**execvp failed, '%s'**\n" %
@@ -133,7 +133,8 @@ class Subprocess:
             time.sleep(execvp_grace_seconds)
             try:
                 pid, err = os.waitpid(self.pid, os.WNOHANG)
-            except os.error, (errno, msg):
+            except os.error as error:
+                errno, msg = error
                 if errno == 10:
                     raise SubprocessError("Subprocess '%s' failed." % self.cmd)
                 raise SubprocessError("Subprocess failed[%d]: %s" % (errno, msg))