abstract away catch_warnings

Author: Kareem Zidane

src/cs50/_sql_util.py

@@ -1,6 +1,8 @@
 """Utility functions used by sql.py"""
 
+import contextlib
 import decimal
+import warnings
 
 
 def fetch_select_result(result):
@@ -17,3 +19,10 @@ def fetch_select_result(result):
                 row[column] = bytes(row[column])
 
     return rows
+
+
+@contextlib.contextmanager
+def raise_errors_for_warnings():
+    with warnings.catch_warnings():
+        warnings.simplefilter("error")
+        yield

src/cs50/sql.py

@@ -1,14 +1,13 @@
 """Wraps SQLAlchemy"""
 
 import logging
-import warnings
 
 import sqlalchemy
 import termcolor
 
 from ._session import Session
 from ._statement import statement_factory
-from ._sql_util import fetch_select_result
+from ._sql_util import fetch_select_result, raise_errors_for_warnings
 
 _logger = logging.getLogger("cs50")
 
@@ -55,10 +54,7 @@ def execute(self, sql, *args, **kwargs):
         return ret
 
     def _execute(self, statement):
-        # Catch SQLAlchemy warnings
-        with warnings.catch_warnings():
-            # Raise exceptions for warnings
-            warnings.simplefilter("error")
+        with raise_errors_for_warnings():
             try:
                 result = self._session.execute(statement)
             except sqlalchemy.exc.IntegrityError as exc: