Diff
1diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
2index 86558ff2ef7bba72ff301e68a31826d57c721966..c2d00c1711ae4c33c78254d36d1edeb8a34f8135 100644
3--- a/plugins/django/django.plugin.zsh
4+++ b/plugins/django/django.plugin.zsh
5@@ -374,7 +374,8 @@ _managepy-commands() {
6 _applist() {
7 local line
8 local -a apps
9- _call_program help-command "python -c \"import os.path as op, re, django.conf, sys;\\
10+ _call_program help-command "python -c \"import sys; del sys.path[0];\\
11+ import os.path as op, re, django.conf;\\
12 bn=op.basename(op.abspath(op.curdir));[sys\\
13 .stdout.write(str(re.sub(r'^%s\.(.*?)$' %
14 bn, r'\1', i)) + '\n') for i in django.conf.settings.\\
15diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
16index 20d5eb1c9928e05b61631072910a7fd106235906..912c835090b4155207c0cecc4c3d129bf7b2cf97 100644
17--- a/plugins/jsontools/jsontools.plugin.zsh
18+++ b/plugins/jsontools/jsontools.plugin.zsh
19@@ -11,9 +11,10 @@ if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METH
20 alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
21 alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
22 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
23- alias pp_json='python -mjson.tool'
24+ alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
25 alias is_json='python -c "
26-import json, sys;
27+import sys; del sys.path[0];
28+import json;
29 try:
30 json.loads(sys.stdin.read())
31 except ValueError, e:
32@@ -22,11 +23,13 @@ else:
33 print True
34 sys.exit(0)"'
35 alias urlencode_json='python -c "
36-import urllib, json, sys;
37+import sys; del sys.path[0];
38+import urllib, json;
39 print urllib.quote_plus(sys.stdin.read())
40 sys.exit(0)"'
41 alias urldecode_json='python -c "
42-import urllib, json, sys;
43+import sys; del sys.path[0];
44+import urllib, json;
45 print urllib.unquote_plus(sys.stdin.read())
46 sys.exit(0)"'
47 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
48@@ -36,4 +39,4 @@ elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_MET
49 alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
50 fi
51
52-unset JSONTOOLS_METHOD
53+unset JSONTOOLS_METHOD
54diff --git a/plugins/salt/_salt b/plugins/salt/_salt
55index 10b782af4095bed7d9a177d6cd1000d3e15b4389..78d8611d23451da86a428d0cf2c23eae8fe0c0e9 100644
56--- a/plugins/salt/_salt
57+++ b/plugins/salt/_salt
58@@ -271,7 +271,7 @@ _salt_comp(){
59 fi
60
61 if _cache_invalid salt/salt_dir || ! _retrieve_cache salt/salt_dir; then
62- salt_dir="${$(python2 -c 'import salt; print(salt.__file__);')%__init__*}"
63+ salt_dir="${$(python2 -c 'import sys; del sys.path[0]; import salt; print(salt.__file__);')%__init__*}"
64 _store_cache salt/salt_dir salt_dir
65 fi
66 }
67diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
68index 47d9a34e449a126544e7562c9892d2de77914e5b..b443e5027bbc21a37150eb175b1f69a0da508e8a 100644
69--- a/plugins/urltools/urltools.plugin.zsh
70+++ b/plugins/urltools/urltools.plugin.zsh
71@@ -12,11 +12,11 @@ if [[ $(whence node) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD
72 alias urlencode='node -e "console.log(encodeURIComponent(process.argv[1]))"'
73 alias urldecode='node -e "console.log(decodeURIComponent(process.argv[1]))"'
74 elif [[ $(whence python3) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then
75- alias urlencode='python3 -c "import sys, urllib.parse as up; print(up.quote_plus(sys.argv[1]))"'
76- alias urldecode='python3 -c "import sys, urllib.parse as up; print(up.unquote_plus(sys.argv[1]))"'
77+ alias urlencode='python3 -c "import sys; del sys.path[0]; import urllib.parse as up; print(up.quote_plus(sys.argv[1]))"'
78+ alias urldecode='python3 -c "import sys; del sys.path[0]; import urllib.parse as up; print(up.unquote_plus(sys.argv[1]))"'
79 elif [[ $(whence python2) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then
80- alias urlencode='python2 -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
81- alias urldecode='python2 -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"'
82+ alias urlencode='python2 -c "import sys; del sys.path[0]; import urllib as ul; print ul.quote_plus(sys.argv[1])"'
83+ alias urldecode='python2 -c "import sys; del sys.path[0]; import urllib as ul; print ul.unquote_plus(sys.argv[1])"'
84 elif [[ $(whence xxd) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xshell" ) ]]; then
85 function urlencode() {echo $@ | tr -d "\n" | xxd -plain | sed "s/\(..\)/%\1/g"}
86 function urldecode() {printf $(echo -n $@ | sed 's/\\/\\\\/g;s/\(%\)\([0-9a-fA-F][0-9a-fA-F]\)/\\x\2/g')"\n"}