dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check_all

Browse Source
This commit is contained in:
mdipierro
2016-01-05 07:29:53 -06:00
parent e528c10c21
commit 5132616c6c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/appconfig.py
-1
View File
@@ -35,7 +35,6 @@ from gluon.serializers import json_parser
locker = thread.allocate_lock() locker = thread.allocate_lock()
def AppConfig(*args, **vars): def AppConfig(*args, **vars):
locker.acquire() locker.acquire()
gluon/streamer.py
+4 -4
View File
@@ -25,7 +25,6 @@ regex_stop_range = re.compile('(?<=\-)\d+')
DEFAULT_CHUNK_SIZE = 64 * 1024 DEFAULT_CHUNK_SIZE = 64 * 1024
def streamer(stream, chunk_size=DEFAULT_CHUNK_SIZE, bytes=None): def streamer(stream, chunk_size=DEFAULT_CHUNK_SIZE, bytes=None):
offset = 0 offset = 0
while bytes is None or offset < bytes: while bytes is None or offset < bytes:
@@ -51,11 +50,12 @@ def stream_file_or_304_or_206(
status=200, status=200,
error_message=None error_message=None
): ):
if error_message is None: # FIX THIS
error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request' # if error_message is None:
# error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request'
try: try:
open = file # this makes no sense but without it GAE cannot open files open = file # this makes no sense but without it GAE cannot open files
fp = open(static_file) fp = open(static_file,'rb')
except IOError, e: except IOError, e:
if e[0] == errno.EISDIR: if e[0] == errno.EISDIR:
raise HTTP(403, error_message, web2py_error='file is a directory') raise HTTP(403, error_message, web2py_error='file is a directory')