Skip to content

Commit 98840ee

Browse files
committed
porting thread-local storage to v6
1 parent 959abb5 commit 98840ee

26 files changed

+906
-1082
lines changed

.gitignore

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
.*
2-
!.github
2+
!/.github/
33
!.gitignore
4-
!.travis.yml
54
*.db
65
*.egg-info/
76
*.pyc
8-
build/
9-
dist/
10-
test.db

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"Topic :: Software Development :: Libraries :: Python Modules"
1111
],
1212
description="CS50 library for Python",
13-
install_requires=["Flask>=1.0", "SQLAlchemy<2", "sqlparse", "termcolor"],
13+
install_requires=["Flask>=1.0", "SQLAlchemy", "sqlparse", "termcolor"],
1414
keywords="cs50",
1515
name="cs50",
1616
package_dir={"": "src"},
1717
packages=["cs50"],
1818
url="https://github.com/cs50/python-cs50",
19-
version="7.0.2"
19+
version="7.1.0"
2020
)

src/cs50/__init__.py

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
1-
from .cs50 import get_float, get_int, get_string
2-
from .sql import SQL
3-
from ._logger import _setup_logger
1+
import logging
2+
import os
3+
import sys
4+
5+
6+
# Disable cs50 logger by default
7+
logging.getLogger("cs50").disabled = True
48

5-
_setup_logger()
9+
# Import cs50_*
10+
from .cs50 import get_char, get_float, get_int, get_string
11+
try:
12+
from .cs50 import get_long
13+
except ImportError:
14+
pass
15+
16+
# Hook into flask importing
17+
from . import flask
18+
19+
# Wrap SQLAlchemy
20+
from .sql import SQL

src/cs50/_engine.py

-88
This file was deleted.

src/cs50/_engine_util.py

-43
This file was deleted.

src/cs50/_logger.py

-98
This file was deleted.

src/cs50/_sql_sanitizer.py

-93
This file was deleted.

0 commit comments

Comments
 (0)