From 86880ea080b101daad7d14a677e2d6040e706e5c Mon Sep 17 00:00:00 2001 From: Hardirc Date: Fri, 6 Mar 2015 22:25:03 -0500 Subject: [PATCH 1/2] Improve PEP8 gluon/shell.py --- gluon/shell.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gluon/shell.py b/gluon/shell.py index 7add0607..5297454f 100644 --- a/gluon/shell.py +++ b/gluon/shell.py @@ -32,7 +32,8 @@ from pydal.base import BaseAdapter logger = logging.getLogger("web2py") -def enable_autocomplete_and_history(adir,env): + +def enable_autocomplete_and_history(adir, env): try: import rlcompleter import atexit @@ -43,7 +44,7 @@ def enable_autocomplete_and_history(adir,env): readline.parse_and_bind("bind ^I rl_complete" if sys.platform == 'darwin' else "tab: complete") - history_file = os.path.join(adir,'.pythonhistory') + history_file = os.path.join(adir, '.pythonhistory') try: readline.read_history_file(history_file) except IOError: @@ -132,7 +133,7 @@ def env( port = global_settings.cmd_options.port else: ip, port = '127.0.0.1', '8000' - request.env.http_host = '%s:%s' % (ip,port) + request.env.http_host = '%s:%s' % (ip, port) request.env.remote_addr = '127.0.0.1' request.env.web2py_runtime_gae = global_settings.web2py_runtime_gae @@ -143,8 +144,8 @@ def env( if request.args: path_info = '%s/%s' % (path_info, '/'.join(request.args)) if request.vars: - vars = ['%s=%s' % (k,v) if v else '%s' % k - for (k,v) in request.vars.iteritems()] + vars = ['%s=%s' % (k, v) if v else '%s' % k + for (k, v) in request.vars.iteritems()] path_info = '%s?%s' % (path_info, '&'.join(vars)) request.env.path_info = path_info @@ -313,7 +314,7 @@ def run( except: logger.warning( 'import IPython error; use default python shell') - enable_autocomplete_and_history(adir,_env) + enable_autocomplete_and_history(adir, _env) code.interact(local=_env) From baeb1563332139540eaa02392fc6af0decad96e7 Mon Sep 17 00:00:00 2001 From: gi0baro Date: Tue, 24 Mar 2015 11:45:23 +0100 Subject: [PATCH 2/2] Track pyDAL 15.03 --- gluon/packages/dal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/packages/dal b/gluon/packages/dal index fd1d3314..b08cb1f7 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit fd1d331437d5209b63d2fec7168ebb19e4523275 +Subproject commit b08cb1f779d1ef7973bf460344772778a344a077