diff options
| author | $ea <OwenChia@users.noreply.github.com> | 2016-08-15 08:43:23 +0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2016-08-14 17:43:23 -0700 |
| commit | 40a9d9cb913d113d0606b121ea0d8d570e84c539 (patch) | |
| tree | 22ba9b1505689acf6bfb44c706fcaedc91b46f48 | |
| parent | b44aa61f092de9d7ed699ea098380d9514759ba9 (diff) | |
| download | zsh-40a9d9cb913d113d0606b121ea0d8d570e84c539.tar.gz zsh-40a9d9cb913d113d0606b121ea0d8d570e84c539.tar.bz2 zsh-40a9d9cb913d113d0606b121ea0d8d570e84c539.zip | |
plugins/urltools: add suport for python 3 (#5039)
Python 3!!!!
| -rw-r--r-- | plugins/urltools/urltools.plugin.zsh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh index 22327334d..fa337acba 100644 --- a/plugins/urltools/urltools.plugin.zsh +++ b/plugins/urltools/urltools.plugin.zsh @@ -11,9 +11,12 @@ fi if [[ $(whence node) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xnode" ) ]]; then alias urlencode='node -e "console.log(encodeURIComponent(process.argv[1]))"' alias urldecode='node -e "console.log(decodeURIComponent(process.argv[1]))"' -elif [[ $(whence python) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then - alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"' - alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"' +elif [[ $(whence python3) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then + alias urlencode='python3 -c "import sys, urllib.parse as up; print(up.quote_plus(sys.argv[1]))"' + alias urldecode='python3 -c "import sys, urllib.parse as up; print(up.unquote_plus(sys.argv[1]))"' +elif [[ $(whence python2) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then + alias urlencode='python2 -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"' + alias urldecode='python2 -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"' elif [[ $(whence xxd) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xshell" ) ]]; then function urlencode() {echo $@ | tr -d "\n" | xxd -plain | sed "s/\(..\)/%\1/g"} function urldecode() {printf $(echo -n $@ | sed 's/\\/\\\\/g;s/\(%\)\([0-9a-fA-F][0-9a-fA-F]\)/\\x\2/g')"\n"} |