Merge pull request #14 from sagidayan/API_Dev

Api dev
2015-05-11 21:29:57 +03:00 · 2015-05-11 21:29:57 +03:00 · 252ecbb40e
commit 252ecbb40e
parent 7684936631 58a0617395
237 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 .idea/
+*.pyc
--- a/GithubAPI/GithubAPI.pyc
+++ b/GithubAPI/GithubAPI.pyc
--- a/GithubAPI/init.pyc
+++ b/GithubAPI/init.pyc
--- a/SE_API/API.py
+++ b/SE_API/API.py
@ -48,7 +48,7 @@ def getUserByToken(token):
    for u in query.run(limit=5):
        return u.to_JSON()

-    return json.loads({'message' : 'No User Found'}), 403
+    return json.dumps({'message' : 'No User Found'}), 403


@app.route('/githubOAuth')
--- a/SE_API/API.pyc
+++ b/SE_API/API.pyc
--- a/SE_API/init.pyc
+++ b/SE_API/init.pyc
--- a/User/init.pyc
+++ b/User/init.pyc
--- a/appengine_config.pyc
+++ b/appengine_config.pyc
--- a/lib/flask/init.pyc
+++ b/lib/flask/init.pyc
--- a/lib/flask/_compat.pyc
+++ b/lib/flask/_compat.pyc
--- a/lib/flask/app.pyc
+++ b/lib/flask/app.pyc
--- a/lib/flask/blueprints.pyc
+++ b/lib/flask/blueprints.pyc
--- a/lib/flask/config.pyc
+++ b/lib/flask/config.pyc
--- a/lib/flask/ctx.pyc
+++ b/lib/flask/ctx.pyc
--- a/lib/flask/debughelpers.pyc
+++ b/lib/flask/debughelpers.pyc
--- a/lib/flask/ext/init.pyc
+++ b/lib/flask/ext/init.pyc
--- a/lib/flask/exthook.pyc
+++ b/lib/flask/exthook.pyc
--- a/lib/flask/globals.pyc
+++ b/lib/flask/globals.pyc
--- a/lib/flask/helpers.pyc
+++ b/lib/flask/helpers.pyc
--- a/lib/flask/json.pyc
+++ b/lib/flask/json.pyc
--- a/lib/flask/logging.pyc
+++ b/lib/flask/logging.pyc
--- a/lib/flask/module.pyc
+++ b/lib/flask/module.pyc
--- a/lib/flask/sessions.pyc
+++ b/lib/flask/sessions.pyc
--- a/lib/flask/signals.pyc
+++ b/lib/flask/signals.pyc
--- a/lib/flask/templating.pyc
+++ b/lib/flask/templating.pyc
--- a/lib/flask/testing.pyc
+++ b/lib/flask/testing.pyc
--- a/lib/flask/testsuite/init.pyc
+++ b/lib/flask/testsuite/init.pyc
--- a/lib/flask/testsuite/appctx.pyc
+++ b/lib/flask/testsuite/appctx.pyc
--- a/lib/flask/testsuite/basic.pyc
+++ b/lib/flask/testsuite/basic.pyc
--- a/lib/flask/testsuite/blueprints.pyc
+++ b/lib/flask/testsuite/blueprints.pyc
--- a/lib/flask/testsuite/config.pyc
+++ b/lib/flask/testsuite/config.pyc
--- a/lib/flask/testsuite/deprecations.pyc
+++ b/lib/flask/testsuite/deprecations.pyc
--- a/lib/flask/testsuite/examples.pyc
+++ b/lib/flask/testsuite/examples.pyc
--- a/lib/flask/testsuite/ext.pyc
+++ b/lib/flask/testsuite/ext.pyc
--- a/lib/flask/testsuite/helpers.pyc
+++ b/lib/flask/testsuite/helpers.pyc
--- a/lib/flask/testsuite/regression.pyc
+++ b/lib/flask/testsuite/regression.pyc
--- a/lib/flask/testsuite/reqctx.pyc
+++ b/lib/flask/testsuite/reqctx.pyc
--- a/lib/flask/testsuite/signals.pyc
+++ b/lib/flask/testsuite/signals.pyc
--- a/lib/flask/testsuite/subclassing.pyc
+++ b/lib/flask/testsuite/subclassing.pyc
--- a/lib/flask/testsuite/templating.pyc
+++ b/lib/flask/testsuite/templating.pyc
--- a/lib/flask/testsuite/test_apps/blueprintapp/init.pyc
+++ b/lib/flask/testsuite/test_apps/blueprintapp/init.pyc
--- a/lib/flask/testsuite/test_apps/blueprintapp/apps/init.pyc
+++ b/lib/flask/testsuite/test_apps/blueprintapp/apps/init.pyc
--- a/lib/flask/testsuite/test_apps/blueprintapp/apps/admin/init.pyc
+++ b/lib/flask/testsuite/test_apps/blueprintapp/apps/admin/init.pyc
--- a/lib/flask/testsuite/test_apps/blueprintapp/apps/frontend/init.pyc
+++ b/lib/flask/testsuite/test_apps/blueprintapp/apps/frontend/init.pyc
--- a/lib/flask/testsuite/test_apps/config_module_app.pyc
+++ b/lib/flask/testsuite/test_apps/config_module_app.pyc
--- a/lib/flask/testsuite/test_apps/config_package_app/init.pyc
+++ b/lib/flask/testsuite/test_apps/config_package_app/init.pyc
--- a/lib/flask/testsuite/test_apps/flask_broken/init.pyc
+++ b/lib/flask/testsuite/test_apps/flask_broken/init.pyc
--- a/lib/flask/testsuite/test_apps/flask_broken/b.pyc
+++ b/lib/flask/testsuite/test_apps/flask_broken/b.pyc
--- a/lib/flask/testsuite/test_apps/flask_newext_package/init.pyc
+++ b/lib/flask/testsuite/test_apps/flask_newext_package/init.pyc
--- a/lib/flask/testsuite/test_apps/flask_newext_package/submodule.pyc
+++ b/lib/flask/testsuite/test_apps/flask_newext_package/submodule.pyc
--- a/lib/flask/testsuite/test_apps/flask_newext_simple.pyc
+++ b/lib/flask/testsuite/test_apps/flask_newext_simple.pyc
--- a/lib/flask/testsuite/test_apps/flaskext/init.pyc
+++ b/lib/flask/testsuite/test_apps/flaskext/init.pyc
--- a/lib/flask/testsuite/test_apps/flaskext/oldext_package/init.pyc
+++ b/lib/flask/testsuite/test_apps/flaskext/oldext_package/init.pyc
--- a/lib/flask/testsuite/test_apps/flaskext/oldext_package/submodule.pyc
+++ b/lib/flask/testsuite/test_apps/flaskext/oldext_package/submodule.pyc
--- a/lib/flask/testsuite/test_apps/flaskext/oldext_simple.pyc
+++ b/lib/flask/testsuite/test_apps/flaskext/oldext_simple.pyc
--- a/lib/flask/testsuite/test_apps/importerror.pyc
+++ b/lib/flask/testsuite/test_apps/importerror.pyc
--- a/lib/flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.pyc
+++ b/lib/flask/testsuite/test_apps/lib/python2.5/site-packages/site_app.pyc
--- a/lib/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/init.pyc
+++ b/lib/flask/testsuite/test_apps/lib/python2.5/site-packages/site_package/init.pyc
--- a/lib/flask/testsuite/test_apps/main_app.pyc
+++ b/lib/flask/testsuite/test_apps/main_app.pyc
--- a/lib/flask/testsuite/test_apps/moduleapp/init.pyc
+++ b/lib/flask/testsuite/test_apps/moduleapp/init.pyc
--- a/lib/flask/testsuite/test_apps/moduleapp/apps/init.pyc
+++ b/lib/flask/testsuite/test_apps/moduleapp/apps/init.pyc
--- a/lib/flask/testsuite/test_apps/moduleapp/apps/admin/init.pyc
+++ b/lib/flask/testsuite/test_apps/moduleapp/apps/admin/init.pyc
--- a/lib/flask/testsuite/test_apps/moduleapp/apps/frontend/init.pyc
+++ b/lib/flask/testsuite/test_apps/moduleapp/apps/frontend/init.pyc
--- a/lib/flask/testsuite/test_apps/path/installed_package/init.pyc
+++ b/lib/flask/testsuite/test_apps/path/installed_package/init.pyc
--- a/lib/flask/testsuite/test_apps/subdomaintestmodule/init.pyc
+++ b/lib/flask/testsuite/test_apps/subdomaintestmodule/init.pyc
--- a/lib/flask/testsuite/testing.pyc
+++ b/lib/flask/testsuite/testing.pyc
--- a/lib/flask/testsuite/views.pyc
+++ b/lib/flask/testsuite/views.pyc
--- a/lib/flask/views.pyc
+++ b/lib/flask/views.pyc
--- a/lib/flask/wrappers.pyc
+++ b/lib/flask/wrappers.pyc
--- a/lib/flask_cors/init.pyc
+++ b/lib/flask_cors/init.pyc
--- a/lib/flask_cors/core.pyc
+++ b/lib/flask_cors/core.pyc
--- a/lib/flask_cors/decorator.pyc
+++ b/lib/flask_cors/decorator.pyc
--- a/lib/flask_cors/extension.pyc
+++ b/lib/flask_cors/extension.pyc
--- a/lib/flask_cors/version.pyc
+++ b/lib/flask_cors/version.pyc
--- a/lib/flask_github.pyc
+++ b/lib/flask_github.pyc
--- a/lib/itsdangerous.pyc
+++ b/lib/itsdangerous.pyc
--- a/lib/jinja2/init.pyc
+++ b/lib/jinja2/init.pyc
--- a/lib/jinja2/_compat.pyc
+++ b/lib/jinja2/_compat.pyc
--- a/lib/jinja2/_stringdefs.pyc
+++ b/lib/jinja2/_stringdefs.pyc
--- a/lib/jinja2/bccache.pyc
+++ b/lib/jinja2/bccache.pyc
--- a/lib/jinja2/compiler.pyc
+++ b/lib/jinja2/compiler.pyc
--- a/lib/jinja2/constants.pyc
+++ b/lib/jinja2/constants.pyc
--- a/lib/jinja2/debug.pyc
+++ b/lib/jinja2/debug.pyc
--- a/lib/jinja2/defaults.pyc
+++ b/lib/jinja2/defaults.pyc
--- a/lib/jinja2/environment.pyc
+++ b/lib/jinja2/environment.pyc
--- a/lib/jinja2/exceptions.pyc
+++ b/lib/jinja2/exceptions.pyc
--- a/lib/jinja2/ext.pyc
+++ b/lib/jinja2/ext.pyc
--- a/lib/jinja2/filters.pyc
+++ b/lib/jinja2/filters.pyc
--- a/lib/jinja2/lexer.pyc
+++ b/lib/jinja2/lexer.pyc
--- a/lib/jinja2/loaders.pyc
+++ b/lib/jinja2/loaders.pyc
--- a/lib/jinja2/meta.pyc
+++ b/lib/jinja2/meta.pyc
--- a/lib/jinja2/nodes.pyc
+++ b/lib/jinja2/nodes.pyc
--- a/lib/jinja2/optimizer.pyc
+++ b/lib/jinja2/optimizer.pyc
--- a/lib/jinja2/parser.pyc
+++ b/lib/jinja2/parser.pyc
--- a/lib/jinja2/runtime.pyc
+++ b/lib/jinja2/runtime.pyc
--- a/lib/jinja2/sandbox.pyc
+++ b/lib/jinja2/sandbox.pyc
--- a/lib/jinja2/tests.pyc
+++ b/lib/jinja2/tests.pyc
--- a/lib/jinja2/testsuite/init.pyc
+++ b/lib/jinja2/testsuite/init.pyc
--- a/lib/jinja2/testsuite/api.pyc
+++ b/lib/jinja2/testsuite/api.pyc
--- a/lib/jinja2/testsuite/bytecode_cache.pyc
+++ b/lib/jinja2/testsuite/bytecode_cache.pyc
--- a/Show more
+++ b/Show more