Merge pull request #515 from msabramo/travis

Travis
pallets · May 30, 2012 · 9f05510 · dnicolodi · Jun 12, 2012 · 9f05510
2 parents 086348e + 2c8cbeb
commit 9f05510
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+
+python:
+  - 2.5
+  - 2.6
+  - 2.7
+  - pypy
+
+before_install: pip install simplejson
+
+script: python setup.py test
diff --git a/flask/helpers.py b/flask/helpers.py
@@ -133,13 +133,17 @@ def get_current_user():
     """
     if __debug__:
         _assert_have_json()
+
+    padded = kwargs.get('padded', False)
     if 'padded' in kwargs:
-        if isinstance(kwargs['padded'], str):
+        del kwargs['padded']
-            callback = request.args.get(kwargs['padded']) or 'jsonp'
+
+    if padded:
+        if isinstance(padded, str):
+            callback = request.args.get(padded) or 'jsonp'
         else:
             callback = request.args.get('callback') or \
                        request.args.get('jsonp') or 'jsonp'
-        del kwargs['padded']
         json_str = json.dumps(dict(*args, **kwargs), indent=None)
         content = str(callback) + "(" + json_str + ")"
         return current_app.response_class(content, mimetype='application/javascript')