fixed style, naming of cs50.sql

setup.py

@@ -10,11 +10,11 @@
         "Topic :: Software Development :: Libraries :: Python Modules"
     ],
     description="CS50 library for Python",
-    install_requires=["SQLAlchemy", "sqlparse"],
+    install_requires=["SQLAlchemy", "sqlparse", "termcolor"],
     keywords="cs50",
     name="cs50",
     package_dir={"": "src"},
     packages=["cs50"],
     url="https://github.com/cs50/python-cs50",
-    version="2.2.0"
+    version="2.3.0"
 )

src/cs50/__init__.py

@@ -1,8 +1,8 @@
-import imp
 import sys
 
 from .cs50 import *
 
+
 class CustomImporter(object):
     """
     Import cs50.SQL lazily so that rest of library can be used without SQLAlchemy installed.
@@ -11,14 +11,18 @@ class CustomImporter(object):
     http://xion.org.pl/2012/05/06/hacking-python-imports/
     http://dangerontheranger.blogspot.com/2012/07/how-to-use-sysmetapath-with-python.html
     """
+
     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())

src/cs50/cs50.py

@@ -1,14 +1,42 @@
 from __future__ import print_function
+
 import inspect
 import re
 import sys
 
+from distutils.sysconfig import get_python_lib
+from os.path import abspath, join
+from termcolor import cprint
+from traceback import extract_tb, format_list, format_exception_only
+
+
+def excepthook(type, value, tb):
+    """
+    Format traceback, darkening entries from global site-packages directories
+    and user-specific site-packages directory.
+
+    https://stackoverflow.com/a/46071447/5156190
+    """
+    packages = tuple(join(abspath(p), "") for p in sys.path[1:])
+    for entry in extract_tb(tb):
+        fmt = format_list((entry,))
+        if (entry[0].startswith(packages)):
+            cprint("".join(fmt), attrs=["dark"], end="", file=sys.stderr)
+        else:
+            cprint("".join(fmt), end="", file=sys.stderr)
+    cprint("".join(format_exception_only(type, value)), end="")
+
+
+sys.excepthook = excepthook
+
+
 class flushfile():
     """
     Disable buffering for standard output and standard error.
 
     http://stackoverflow.com/a/231216
     """
+
     def __init__(self, f):
         self.f = f
 
@@ -18,9 +46,12 @@ def __getattr__(self, name):
     def write(self, x):
         self.f.write(x)
         self.f.flush()
+
+
 sys.stderr = flushfile(sys.stderr)
 sys.stdout = flushfile(sys.stdout)
 
+
 def eprint(*args, **kwargs):
     """
     Print an error message to standard error, prefixing it with
@@ -32,6 +63,7 @@ def eprint(*args, **kwargs):
     print("{}:{}: ".format(filename, lineno), end="")
     print(*args, end=end, file=sys.stderr, sep=sep)
 
+
 def get_char(prompt=None):
     """
     Read a line of text from standard input and return the equivalent char;
@@ -49,6 +81,7 @@ def get_char(prompt=None):
         if prompt is None:
             print("Retry: ", end="")
 
+
 def get_float(prompt=None):
     """
     Read a line of text from standard input and return the equivalent float
@@ -69,20 +102,21 @@ def get_float(prompt=None):
         if prompt is None:
             print("Retry: ", end="")
 
+
 def get_int(prompt=None):
     """
     Read a line of text from standard input and return the equivalent int;
     if text does not represent an int, user is prompted to retry. If line
     can't be read, return None.
     """
     while True:
-        s = get_string(prompt);
+        s = get_string(prompt)
         if s is None:
             return None
         if re.search(r"^[+-]?\d+$", s):
             try:
                 i = int(s, 10)
-                if type(i) is int: # could become long in Python 2
+                if type(i) is int:  # could become long in Python 2
                     return i
             except ValueError:
                 pass
@@ -91,6 +125,7 @@ def get_int(prompt=None):
         if prompt is None:
             print("Retry: ", end="")
 
+
 if sys.version_info.major != 3:
     def get_long(prompt=None):
         """
@@ -112,6 +147,7 @@ def get_long(prompt=None):
             if prompt is None:
                 print("Retry: ", end="")
 
+
 def get_string(prompt=None):
     """
     Read a line of text from standard input and return it as a string,

src/cs50/sql.py

@@ -8,6 +8,7 @@
 import sys
 import warnings
 
+
 class SQL(object):
     """Wrap SQLAlchemy to provide a simple SQL API."""
 
@@ -23,7 +24,7 @@ def __init__(self, url, **kwargs):
 
         # log statements to standard error
         logging.basicConfig(level=logging.DEBUG)
-        self.logger = logging.getLogger(__name__)
+        self.logger = logging.getLogger("cs50")
 
         # create engine, raising exception if back end's module not installed
         self.engine = sqlalchemy.create_engine(url, **kwargs)
@@ -36,7 +37,9 @@ class UserDefinedType(sqlalchemy.TypeDecorator):
             """
             Add support for expandable values, a la https://bitbucket.org/zzzeek/sqlalchemy/issues/3953/expanding-parameter.
             """
+
             impl = sqlalchemy.types.UserDefinedType
+
             def process_literal_param(self, value, dialect):
                 """Receive a literal parameter value to be rendered inline within a statement."""
                 def process(value):
@@ -109,7 +112,8 @@ def process(value):
 
                 # bind parameters before statement reaches database, so that bound parameters appear in exceptions
                 # http://docs.sqlalchemy.org/en/latest/core/sqlelement.html#sqlalchemy.sql.expression.text
-                statement = statement.bindparams(sqlalchemy.bindparam(key, value=value, type_=UserDefinedType()))
+                statement = statement.bindparams(sqlalchemy.bindparam(
+                    key, value=value, type_=UserDefinedType()))
 
             # stringify bound parameters
             # http://docs.sqlalchemy.org/en/latest/faq/sqlexpressions.html#how-do-i-render-sql-expressions-as-strings-possibly-with-bound-parameters-inlined

tests/tb.py

@@ -0,0 +1,6 @@
+import cs50
+import requests
+
+def f():
+    res = requests.get("cs50.harvard.edu")
+f()