tidied code

Author: dmalan

src/cs50/flask.py

@@ -14,20 +14,21 @@ def _wrap_flask(f):
 
     f.logging.default_handler.formatter.formatException = lambda exc_info: _formatException(*exc_info)
 
-    if os.getenv("CS50_IDE_TYPE") == "online":
+    if os.getenv("CS50_IDE_TYPE"):
         from werkzeug.middleware.proxy_fix import ProxyFix
         _flask_init_before = f.Flask.__init__
         def _flask_init_after(self, *args, **kwargs):
             _flask_init_before(self, *args, **kwargs)
-            self.wsgi_app = ProxyFix(self.wsgi_app, x_proto=1)
+            self.config["TEMPLATES_AUTO_RELOAD"] = True  # Automatically reload templates
+            self.wsgi_app = ProxyFix(self.wsgi_app, x_proto=1)  # For HTTPS-to-HTTP proxy
         f.Flask.__init__ = _flask_init_after
 
 
-# Flask was imported before cs50
+# If Flask was imported before cs50
 if "flask" in sys.modules:
     _wrap_flask(sys.modules["flask"])
 
-# Flask wasn't imported
+# If Flask wasn't imported
 else:
     flask_loader = pkgutil.get_loader('flask')
     if flask_loader:

src/cs50/sql.py

@@ -333,10 +333,9 @@ def shutdown_session(exception=None):
                 # Execute statement
                 if self._autocommit:
                     connection.execute(sqlalchemy.text("BEGIN"))
-                    result = connection.execute(sqlalchemy.text(statement))
+                result = connection.execute(sqlalchemy.text(statement))
+                if self._autocommit:
                     connection.execute(sqlalchemy.text("COMMIT"))
-                else:
-                    result = connection.execute(sqlalchemy.text(statement))
 
                 # Check for end of transaction
                 if command in ["COMMIT", "ROLLBACK"]: