From 6faacfbf36c75f8d8ec83482a4600b6dd6e0d1e3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 26 Jul 2013 15:56:03 -0500 Subject: [PATCH] fixed issue 1607:NamedTemporaryFile broke GAE, thanks Alan --- VERSION | 2 +- gluon/main.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 26115f44..76aae619 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.26.03.03.00 +Version 2.6.0-development+timestamp.2013.07.26.15.55.14 diff --git a/gluon/main.py b/gluon/main.py index 1fa2a027..b3c37fbb 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -172,7 +172,10 @@ def copystream_progress(request, chunk_size=10 ** 5): size = int(env.content_length) except ValueError: raise HTTP(400, "Invalid Content-Length header") - dest = tempfile.NamedTemporaryFile() + try: # Android requires this + dest = tempfile.NamedTemporaryFile() + except NotImplementedError: # and GAE this + dest = tempfile.TemporaryFile() if not 'X-Progress-ID' in request.vars: copystream(source, dest, size, chunk_size) return dest