diff --git a/.gitignore b/.gitignore index 08786af..5f0c39d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ __pycache__/ *.py[cod] *$py.class +.DS_store # C extensions *.so @@ -60,5 +61,3 @@ target/ #Ipython Notebook .ipynb_checkpoints - -.DS_Store diff --git a/example/app.py b/example/app.py index abcb80a..ca8fd23 100644 --- a/example/app.py +++ b/example/app.py @@ -65,4 +65,4 @@ class app(server.WebApp): if __name__ == '__main__': server = server.jolla_server(app) - server.run_server() + server.run_server(reload = True) diff --git a/jolla/HTTPerror.pyc b/jolla/HTTPerror.pyc new file mode 100644 index 0000000..f5c875c Binary files /dev/null and b/jolla/HTTPerror.pyc differ diff --git a/jolla/__init__.pyc b/jolla/__init__.pyc new file mode 100644 index 0000000..376b444 Binary files /dev/null and b/jolla/__init__.pyc differ diff --git a/jolla/plugins.pyc b/jolla/plugins.pyc new file mode 100644 index 0000000..c1de109 Binary files /dev/null and b/jolla/plugins.pyc differ diff --git a/jolla/server.py b/jolla/server.py index 88645e1..e91db62 100644 --- a/jolla/server.py +++ b/jolla/server.py @@ -94,16 +94,16 @@ def __init__(self, environ=None, get_urls=True): self.request['data'] = {} self.request['query_string'] = {} - + # Beyond Comp line = self._environ['QUERY_STRING'] - request_data = environ['wsgi.input'].read() + request_data = environ['wsgi.input'].read(environ.get('content_length', 0)) if request_data: request_data = unquote(request_data) for data_pair in request_data.split('&'): key, value = data_pair.split('=') self.request['data'][key] = value - + # up query_string = self._environ['QUERY_STRING'] if query_string: query_string = unquote(query_string) @@ -114,7 +114,7 @@ def __init__(self, environ=None, get_urls=True): self.request['query_string'][key] = value except ValueError: pass - + # Below Comp if not get_urls: for url in self.urls: try: @@ -232,7 +232,13 @@ def application(self, environ, start_response): return html_code[0] - def run_server(self): + def run_server(self, reload = False): print "the server is running on the {} in the port {}".format(self.host, self.port) - - self.serve_forever() + if reload: + from werkzeug.serving import run_simple + run_simple(self.host, self.port, self, use_debugger=True, use_reloader=True) + else: + self.serve_forever() + + def __call__(self, environ, start_response): + return self.application(environ, start_response) diff --git a/jolla/server.pyc b/jolla/server.pyc new file mode 100644 index 0000000..2490a11 Binary files /dev/null and b/jolla/server.pyc differ diff --git a/jolla/session.pyc b/jolla/session.pyc new file mode 100644 index 0000000..34cc965 Binary files /dev/null and b/jolla/session.pyc differ diff --git a/setup.py b/setup.py index 9172347..0421e1d 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,8 @@ download_url='https://github.com/salamer/jolla', install_requires=[ - 'gevent' + 'gevent', + 'werkzeug' ], packages=['jolla'],