Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

Vendorize argparse

Browse Source 
This adds the argparse library [1] as autojump_argparse and imports it
via sys.path mangling in case argparse does not exist (Python 2.6 or
below without argparse installed).

This makes autojump effectively work with Python 2.6 again by default.

I have not verified license compatibility, but given the intention of
the (backport) project this is likely OK (it is licensed under the
Python license).

1: http://code.google.com/p/argparse/

Fixes issue #121.
This commit is contained in:
Daniel Hahler 2012-09-26 22:04:45 +02:00
parent 1ab78ae91c
commit 4382116b55
3 changed files with 2374 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/autojump
View File

@ -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'

2362
bin/autojump_argparse.py Normal file
View File

File diff suppressed because it is too large Load Diff

32
install.sh
View File

@ -110,35 +110,10 @@ fi
if [ ! ${force} ]; then
python_version=`python -c 'import sys; print(sys.version_info[:])'`
if [[ ${python_version:1:1} -eq 3 && ${python_version:4:1} -lt 2 ]]; then
if [[ ${python_version:1:1} -eq 2 && ${python_version:4:1} -lt 6 ]]; then
echo
echo "Incompatible Python version, please upgrade to v2.7+ or v3.2+."
echo
echo "Alternatively, you can download v19 that supports Python v3.0+ from:"
echo
echo -e "\thttps://github.com/joelthelion/autojump/downloads"
echo
echo "OR"
echo
echo "Install argparse manually using 'pip install argparse' and then reattempt the installation using the --force option."
echo
exit 1
fi
if [[ ${python_version:1:1} -eq 2 && ${python_version:4:1} -lt 7 ]]; then
echo
echo "Incompatible Python version, please upgrade to v2.7+ or v3.2+."
if [[ ${python_version:4:1} -ge 6 ]]; then
echo
echo "Alternatively, you can download v19 that supports Python v2.6+ from:"
echo
echo -e "\thttps://github.com/joelthelion/autojump/downloads"
echo
echo "OR"
echo
echo "Install argparse manually using 'pip install argparse' and then reattempt the installation using the --force option."
echo
elif [[ ${python_version:4:1} -ge 4 ]]; then
echo "Incompatible Python version, please upgrade to v2.6+."
if [[ ${python_version:4:1} -ge 4 ]]; then
echo
echo "Alternatively, you can download v12 that supports Python v2.4+ from:"
echo
@ -163,6 +138,7 @@ mkdir -p ${prefix}/share/man/man1/
cp -v ./bin/icon.png ${prefix}/share/autojump/
cp -v ./bin/jumpapplet ${prefix}/bin/
cp -v ./bin/autojump ${prefix}/bin/
cp -v ./bin/autojump_argparse.py ${prefix}/bin/
cp -v ./docs/autojump.1 ${prefix}/share/man/man1/
# global installation