Replace FileNotFoundError with errno.ENOENT for py2 compatibility

piqueserver/server.py

@@ -215,9 +215,12 @@ def __init__(self, interface, config):
         try:
             with open(os.path.join(cfg.config_dir, 'bans.txt'), 'r') as f:
                 self.bans.read_list(json.load(f))
-        except FileNotFoundError as e:
-            # if it doesn't exist, then no bans, no error
-            pass
+        except OSError as e:
+            if e.errno == errno.ENOENT:
+                # if it doesn't exist, then no bans, no error
+                pass
+            else:
+                raise e
         except IOError as e:
             print('Could not read bans.txt: {}'.format(e))
         except ValueError as e:

piqueserver/ssh.py

@@ -17,7 +17,7 @@
 
 import sys
 from os import path
-
+import errno
 try:
     from twisted.cred import portal, checkers
     from twisted.conch import manhole, manhole_ssh
@@ -53,14 +53,16 @@ def create_remote_protocol(_):
     try:
         f.publicKeys[b"ssh-rsa"] = keys.Key.fromFile(ssh_pubkey_path)
         f.privateKeys[b"ssh-rsa"] = keys.Key.fromFile(ssh_privkey_path)
-    except FileNotFoundError:
-        print("ERROR: You don't have any keys in the host key location")
-        print("Generate one with:")
-        print("  mkdir {}".format(ssh_key_base_path))
-        print("  ssh-keygen -f {} -t rsa".format(ssh_privkey_path))
-        print("make sure to specify no password")
-
-        sys.exit(1)
+    except OSError as e:
+        if e.errno == errno.ENOENT:
+            print("ERROR: You don't have any keys in the host key location")
+            print("Generate one with:")
+            print("  mkdir {}".format(ssh_key_base_path))
+            print("  ssh-keygen -f {} -t rsa".format(ssh_privkey_path))
+            print("make sure to specify no password")
+            sys.exit(1)
+        else:
+            raise e
     return f