projects
/
python-collate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates for new hosting.
[python-collate.git]
/
pycollate
diff --git
a/pycollate
b/pycollate
index
e38e91d
..
4748b4b
100755
(executable)
--- a/
pycollate
+++ b/
pycollate
@@
-33,7
+33,7
@@
def main(argv):
if options.backend or options.locale or options.encoding:
backend = getattr(collate, options.backend)
if options.backend or options.locale or options.encoding:
backend = getattr(collate, options.backend)
- collate.set_
default
(backend, options.locale, options.encoding)
+ collate.set_
collator
(backend, options.locale, options.encoding)
if options.diagnostics:
print >>sys.stderr, "Backend: " + collate.default.__name__
if options.diagnostics:
print >>sys.stderr, "Backend: " + collate.default.__name__
@@
-54,7
+54,7
@@
def main(argv):
line = line.strip()
line = line.decode(encoding, "replace")
lines.append(line)
line = line.strip()
line = line.decode(encoding, "replace")
lines.append(line)
- lines.sort(key=collate.
collator.sorteme
key)
+ lines.sort(key=collate.key)
for line in lines:
print line.encode(encoding, "replace")
for line in lines:
print line.encode(encoding, "replace")