dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #870 from BuhtigithuB/pep8-shell-py

Browse Source 
Improve PEP8 gluon/shell.py
This commit is contained in:
mdipierro
2015-03-24 11:40:13 -05:00
parent debd84e287 86880ea080
commit bd899ea304
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gluon/shell.py
View File

@@ -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)