summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-11 22:07:40 -0500
committerMichael Merickel <michael@merickel.org>2015-10-11 22:07:40 -0500
commitd3730af63891f1e35f5cb17c139fd85776a8e2ad (patch)
tree923326dada00c7f0a4f3b4bf2400d1adf10798d3
parent803f94d51f5d630a99b9aa2c47f7de40a5d75ea1 (diff)
downloadpyramid-d3730af63891f1e35f5cb17c139fd85776a8e2ad.tar.gz
pyramid-d3730af63891f1e35f5cb17c139fd85776a8e2ad.tar.bz2
pyramid-d3730af63891f1e35f5cb17c139fd85776a8e2ad.zip
order shells alphabetically instead of prioritizing ipython/bpython
-rw-r--r--pyramid/scripts/pshell.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/pyramid/scripts/pshell.py b/pyramid/scripts/pshell.py
index 9c2573caa..78ff66853 100644
--- a/pyramid/scripts/pshell.py
+++ b/pyramid/scripts/pshell.py
@@ -169,21 +169,16 @@ class PShellCommand(object):
def make_shell(self):
shells = {}
- priority_order = ['ipython', 'bpython', 'python']
-
for ep in self.pkg_resources.iter_entry_points('pyramid.pshell'):
name = ep.name
shell_module = ep.load()
shells[name] = shell_module
- sorted_shells = sorted(
- shells.items(), key=lambda x: priority_order.index(x[0])
- )
-
shell = None
user_shell = self.options.python_shell.lower()
if not user_shell:
+ sorted_shells = sorted(shells.items(), key=lambda k, v: k)
for name, factory in sorted_shells:
shell = factory()