X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/1a34d3c566e747bbff9335b34369529eb1c585c7..7b1def6f18cd2ee0f1630b1a87e746333a8ef801:/pokedex/__init__.py?ds=sidebyside

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 73391dc..6a4ab95 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -15,7 +15,7 @@ def main():
 
     # XXX there must be a better way to get Unicode argv
     # XXX this doesn't work on Windows durp
-    enc = sys.stdin.encoding
+    enc = sys.stdin.encoding or 'utf8'
     args = [_.decode(enc) for _ in args]
 
     # Find the command as a function in this file
@@ -67,7 +67,12 @@ def command_lookup(name):
         print "Fuzzy-matched:"
 
     for result in results:
-        print "%s: %s" % (result.object.__tablename__, result.object.name),
+        if hasattr(result.object, 'full_name'):
+            name = result.object.full_name
+        else:
+            name = result.object.name
+
+        print "%s: %s" % (result.object.__tablename__, name),
         if result.language:
             print "(%s in %s)" % (result.name, result.language)
         else: