--- a/bin/airport	Sun Oct 30 23:43:42 2016 +0000
+++ b/bin/airport	Sun Oct 30 23:43:47 2016 +0000
@@ -1,14 +1,1 @@
-#! /usr/bin/env python
-
-import csv
-import sys
-
-fields = dict(name=1, iata=4, icao=5)
-if len(sys.argv) != 3: sys.stderr.write('usage: airport name|iata|icao key\n'); sys.exit(1)
-kind, q = sys.argv[1:3]
-if kind not in fields: sys.stderr.write('unknown search type: %s\n' % kind); sys.exit(1)
-
-with open('share/airports.dat', 'rb') as datafile:
-  for row in csv.reader(datafile):
-    if q.lower() in row[fields[kind]].lower():
-      print '%s (%s, %s)' % (row[1], row[4] if row[4] else '?', row[5] if row[5] else '?')
+airport-lookup any "$*"