Author: Ronny Pfannschmidt <[email protected]>
Branch:
Changeset: r195:ae89de421288
Date: 2012-05-03 18:16 +0200
http://bitbucket.org/pypy/pyrepl/changeset/ae89de421288/
Log: kill uniqify for sorted(set(...))
diff --git a/pyrepl/cmdrepl.py b/pyrepl/cmdrepl.py
--- a/pyrepl/cmdrepl.py
+++ b/pyrepl/cmdrepl.py
@@ -53,8 +53,8 @@
def get_completions(self, stem):
if len(stem) != self.pos:
return []
- return cr.uniqify([s for s in self.completions
- if s.startswith(stem)])
+ return sorted(set(s for s in self.completions
+ if s.startswith(stem)))
def replize(klass, history_across_invocations=1):
diff --git a/pyrepl/completing_reader.py b/pyrepl/completing_reader.py
--- a/pyrepl/completing_reader.py
+++ b/pyrepl/completing_reader.py
@@ -21,13 +21,6 @@
from pyrepl import commands, reader
from pyrepl.reader import Reader
-def uniqify(l):
- d = {}
- for i in l:
- d[i] = 1
- r = d.keys()
- r.sort()
- return r
def prefix(wordlist, j = 0):
d = {}
diff --git a/pyrepl/module_lister.py b/pyrepl/module_lister.py
--- a/pyrepl/module_lister.py
+++ b/pyrepl/module_lister.py
@@ -17,7 +17,6 @@
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-from pyrepl.completing_reader import uniqify
import os, sys
# for the completion support.
@@ -38,9 +37,7 @@
l.append( prefix + fname )
_packages[prefix + fname] = _make_module_list_dir(
file, suffs, prefix + fname + '.' )
- l = uniqify(l)
- l.sort()
- return l
+ return sorted(set(l))
def _make_module_list():
import imp
diff --git a/pyrepl/python_reader.py b/pyrepl/python_reader.py
--- a/pyrepl/python_reader.py
+++ b/pyrepl/python_reader.py
@@ -155,7 +155,7 @@
return [x[len(mod) + 1:]
for x in l if x.startswith(mod + '.' + name)]
try:
- l = completing_reader.uniqify(self.completer.complete(stem))
+ l = sorted(set(self.completer.complete(stem)))
return l
except (NameError, AttributeError):
return []
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
