wrapping in try/finally

Author: dmalan

src/cs50/__init__.py

@@ -1,47 +1,48 @@
 import os
 import sys
 
-# Save student's sys.path
-path = sys.path[:]
-
-# In case student has files that shadow packages
-sys.path = [p for p in sys.path if p not in ("", os.getcwd())]
-
-# Import cs50_*
-from .cs50 import eprint, get_char, get_float, get_int, get_string
 try:
-    from .cs50 import get_long
-except:
-    pass
 
-# Monkey patches
-from . import flask
+    # Save student's sys.path
+    path = sys.path[:]
+
+    # In case student has files that shadow packages
+    sys.path = [p for p in sys.path if p not in ("", os.getcwd())]
 
+    # Import cs50_*
+    from .cs50 import eprint, get_char, get_float, get_int, get_string
+    try:
+        from .cs50 import get_long
+    except:
+        pass
 
-class CustomImporter(object):
-    """
-    Import cs50.SQL lazily so that rest of library can be used without SQLAlchemy installed.
+    # Replace flask's logger
+    from . import flask
 
-    https://docs.python.org/3/library/imp.html
-    http://xion.org.pl/2012/05/06/hacking-python-imports/
-    http://dangerontheranger.blogspot.com/2012/07/how-to-use-sysmetapath-with-python.html
-    """
+    class CustomImporter(object):
+        """
+        Import cs50.SQL lazily so that rest of library can be used without SQLAlchemy installed.
 
-    def find_module(self, fullname, path=None):
-        if fullname == "cs50.SQL":
-            return self
-        return None
+        https://docs.python.org/3/library/imp.html
+        http://xion.org.pl/2012/05/06/hacking-python-imports/
+        http://dangerontheranger.blogspot.com/2012/07/how-to-use-sysmetapath-with-python.html
+        """
 
-    def load_module(self, name):
-        if name in sys.modules:
-            return sys.modules[name]
-        from .sql import SQL
-        sys.modules[name] = SQL
-        return SQL
+        def find_module(self, fullname, path=None):
+            if fullname == "cs50.SQL":
+                return self
+            return None
 
+        def load_module(self, name):
+            if name in sys.modules:
+                return sys.modules[name]
+            from .sql import SQL
+            sys.modules[name] = SQL
+            return SQL
 
-sys.meta_path.append(CustomImporter())
+    sys.meta_path.append(CustomImporter())
 
+finally:
 
-# Restore student's sys.path
-sys.path = path
+    # Restore student's sys.path (just in case library raised an exception that caller caught)
+    sys.path = path