diff --git a/gluon/globals.py b/gluon/globals.py index 8d8df77b..267ea661 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -954,7 +954,7 @@ class Session(Storage): cookie_expires.strftime(FMT) session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) - response.session_hash = hashlib_md5(session_pickled).hexdigest() + response.session_hash = hashlib.md5(session_pickled).hexdigest() if self.flash: (response.flash, self.flash) = (self.flash, None) @@ -1141,7 +1141,7 @@ class Session(Storage): return True session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) response.session_pickled = session_pickled - session_hash = hashlib_md5(session_pickled).hexdigest() + session_hash = hashlib.md5(session_pickled).hexdigest() return response.session_hash == session_hash def _try_store_in_db(self, request, response): diff --git a/gluon/rewrite.py b/gluon/rewrite.py index 0b19777d..fa4ac972 100644 --- a/gluon/rewrite.py +++ b/gluon/rewrite.py @@ -206,8 +206,7 @@ def url_out(request, environ, application, controller, function, if host is True or (host is None and (scheme or port is not None)): host = request.env.http_host if not scheme or scheme is True: - scheme = request.env.get('wsgi_url_scheme', 'http').lower() \ - if request else 'http' + scheme = request.env.get('wsgi_url_scheme', 'http').lower() if request else 'http' if host: host_port = host if not port else host.split(':', 1)[0] + ':%s' % port url = '%s://%s%s' % (scheme, host_port, url)