Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exception changes #24

Merged
merged 5 commits into from
May 25, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -15,5 +15,5 @@
name="cs50",
packages=["cs50"],
url="https://github.com/cs50/python-cs50",
version="2.1.0"
version="2.2.0"
)
17 changes: 6 additions & 11 deletions src/cs50/sql.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import datetime
import importlib
import logging
import re
import sqlalchemy
@@ -17,13 +18,13 @@ def __init__(self, url, **kwargs):
http://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine
http://docs.sqlalchemy.org/en/latest/dialects/index.html
"""

# log statements to standard error
logging.basicConfig(level=logging.DEBUG)
self.logger = logging.getLogger(__name__)
try:
self.engine = sqlalchemy.create_engine(url, **kwargs)
except Exception as e:
e.__cause__ = None
raise RuntimeError(e)

# create engine, raising exception if back end's module not installed
self.engine = sqlalchemy.create_engine(url, **kwargs)

def execute(self, text, **params):
"""
@@ -138,9 +139,3 @@ def process(value):
# if constraint violated, return None
except sqlalchemy.exc.IntegrityError:
return None

# else raise exception
except Exception as e:
_e = RuntimeError(e) # else Python 3 prints warnings' tracebacks
_e.__cause__ = None
raise _e