Skip to content

Commit c675d52

Browse files
chrisgzfKareem Zidane
authored andcommitted
Fix namespace conflict in Flask monkey-patch
1 parent 204b4c8 commit c675d52

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/cs50/flask.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@
3131
except ImportError:
3232
pass
3333
else:
34-
_before = SQL.SQL.execute
35-
def _after(self, *args, **kwargs):
34+
_sql_before = SQL.execute
35+
def _sql_after(self, *args, **kwargs):
3636
disabled = logging.getLogger("cs50").disabled
3737
if flask.current_app:
3838
logging.getLogger("cs50").disabled = False
3939
try:
40-
return _before(self, *args, **kwargs)
40+
return _sql_before(self, *args, **kwargs)
4141
finally:
4242
logging.getLogger("cs50").disabled = disabled
43-
SQL.SQL.execute = _after
43+
SQL.execute = _sql_after
4444

4545
# When behind CS50 IDE's proxy, ensure that flask.redirect doesn't redirect from HTTPS to HTTP
4646
# https://werkzeug.palletsprojects.com/en/0.15.x/middleware/proxy_fix/#module-werkzeug.middleware.proxy_fix
4747
if getenv("C9_HOSTNAME") and not getenv("IDE_OFFLINE"):
4848
try:
4949
import flask
5050
from werkzeug.middleware.proxy_fix import ProxyFix
51-
_before = flask.Flask.__init__
52-
def _after(self, *args, **kwargs):
53-
_before(self, *args, **kwargs)
51+
_flask_before = flask.Flask.__init__
52+
def _flask_after(self, *args, **kwargs):
53+
_flask_before(self, *args, **kwargs)
5454
self.wsgi_app = ProxyFix(self.wsgi_app, x_proto=1)
55-
flask.Flask.__init__ = _after
55+
flask.Flask.__init__ = _flask_after
5656
except:
5757
pass
5858

0 commit comments

Comments
 (0)