Merge pull request wting#150 from blueyed/master

Make autojump work with Python 2.6 again: vendorize argparse.
SPGWhistler · Sep 26, 2012 · a2657d6 · a2657d6
2 parents 1ab78ae + 4382116
commit a2657d6
Show file tree

Hide file tree

Showing 3 changed files with 2,374 additions and 31 deletions.
diff --git a/bin/autojump b/bin/autojump
@@ -21,12 +21,17 @@
 
 from __future__ import division, print_function
 
-import argparse
-from operator import itemgetter
+import sys
 import os
+try:
+  import argparse
+except ImportError:
+  sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+  import autojump_argparse as argparse
+  sys.path.pop()
+from operator import itemgetter
 import re
 import shutil
-import sys
 from tempfile import NamedTemporaryFile
 
 VERSION = 'release-v21-rc.2'