* [PATCH] cache list of all python modules
@ 2015-01-27 16:49 Jun T.
2015-01-28 11:54 ` Jun T.
0 siblings, 1 reply; 3+ messages in thread
From: Jun T. @ 2015-01-27 16:49 UTC (permalink / raw)
To: zsh-workers
A new function _python_modules will create and cache the list of
all the python modules.
_python and _pydoc are updated to call this function.
(_pydoc is also updated for python3)
#compdef lines in _python/_pydoc are modified to use -P pattern.
Jun
---
Completion/Unix/Command/_pydoc | 41 ++++++++++++++++++++++-----------
Completion/Unix/Command/_python | 15 +++---------
Completion/Unix/Type/_python_modules | 44 ++++++++++++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 25 deletions(-)
create mode 100644 Completion/Unix/Type/_python_modules
diff --git a/Completion/Unix/Command/_pydoc b/Completion/Unix/Command/_pydoc
index f85ab0c..677c96a 100644
--- a/Completion/Unix/Command/_pydoc
+++ b/Completion/Unix/Command/_pydoc
@@ -1,19 +1,34 @@
-#compdef pydoc
+#compdef -P pydoc[0-9.]#
-local context state line ret=1
+local curcontext=$curcontext state state_descr line ret=1
typeset -A opt_args
+local -a args
-_arguments \
- '(-)-k[search keyword]:keyword' \
- '(- *)-p[start web server on specified port]:port number' \
- '(- *)-g[start gui]' \
- '(-)-w[write out HTML]:file or dir:_files' \
- '(- *)-h[show help information]' \
- '*: :->lookup' && ret=0
+args=(
+ '(- *)-k[search keyword]:keyword'
+ '(-k -g -w *)-p[start web server on specified port]:port number'
+ '(-)-w[write out HTML in current directory]'
+ '(-)*: :->lookup'
+)
-[[ -n $state ]] && _alternative -C $context \
- 'keywords:keyword:compadd ${=${${(f)"$(_call_program keywords pydoc keywords)"}[2,-1]}}' \
- 'topics:topic:compadd ${=${${(f)"$(_call_program topics pydoc topics)"}[2,-1]}}' \
- 'modules:module:' && ret=0
+if _pick_variant pydoc3='pydoc3 -b' pydoc2 -h; then
+ args+=( '(-k -w *)-b[start server and open browser]' )
+else
+ args+=( '(- *)-g[start gui]' )
+fi
+
+_arguments -C : $args && return 0
+
+case $state in
+(lookup)
+ if [[ $words[CURRENT] = */* ]]; then
+ _files && ret=0
+ else
+ _alternative \
+ 'keywords:keyword:compadd ${=${${(f)"$(_call_program keywords $words[1] keywords)"}[2,-1]}}' \
+ 'topics:topic:compadd ${=${${(f)"$(_call_program topics $words[1] topics)"}[2,-1]}}' \
+ 'modules:module:_python_modules' && ret=0
+ fi
+esac
return ret
diff --git a/Completion/Unix/Command/_python b/Completion/Unix/Command/_python
index 8e32bdf..dedb9ce 100644
--- a/Completion/Unix/Command/_python
+++ b/Completion/Unix/Command/_python
@@ -1,11 +1,10 @@
-#compdef python python2 python2.4 python2.5 python2.6 python2.7 python3.0 python3.1 python3.2 python3.3 python3.4
+#compdef -P python[0-9.]#
# Python 2.7
# Python 3.4
-local curcontext="$curcontext" state line expl
+local curcontext="$curcontext" state state_descr line
typeset -A opt_args
-
local -a args
if _pick_variant python3=Python\ 3 python2 --version; then
@@ -32,7 +31,7 @@ _arguments -C -s -S "$args[@]" \
'-E[ignore PYTHON* environment variables (such as PYTHONPATH)]' \
'(1 * -)-h[display help information]' \
'-i[inspect interactively after running script]' \
- '(1 -)-m[run library module as a script (terminates option list)]:module:->modules' \
+ '(1 -)-m[run library module as a script (terminates option list)]:module:_python_modules' \
'-O[optimize generated bytecode slightly]' \
'-OO[remove doc-strings in addition to the -O optimizations]' \
"-s[don't add user site directory to sys.path]" \
@@ -46,14 +45,6 @@ _arguments -C -s -S "$args[@]" \
'*::script argument:= ->normal' && return
case "$state" in
- modules)
- local -a modules
- modules=(
- ${${=${(f)"$(_call_program modules $words[1] -c \
- 'from\ pydoc\ import\ help\;\ help\(\"modules\"\)')"}[2,-3]}:#\(package\)}
- )
- _wanted modules expl module compadd -a modules && return
- ;;
normal)
if [[ -z "$opt_args[(I)-(c|m)]" ]]; then
shift words
diff --git a/Completion/Unix/Type/_python_modules b/Completion/Unix/Type/_python_modules
new file mode 100644
index 0000000..b30848d
--- /dev/null
+++ b/Completion/Unix/Type/_python_modules
@@ -0,0 +1,44 @@
+#autoload
+
+_python_module_caching_policy () {
+ local -a newer
+ # rebuild if cache does not exist or is more than a week old
+ newer=( "$1"(Nmw-1) )
+ return $#newer
+}
+
+_python_modules () {
+ local update_policy python expl
+
+ case $words[1] in
+ (python*) python=$words[1] ;;
+ (pydoc*) python=${words[1]/#pydoc/python} ;;
+ (*) python="python" ;;
+ esac
+ local cache_id=${${python//[^[:alnum:]]/_}#_}_modules
+ local array_name=_${cache_id}
+
+ zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+ [[ -z "$update_policy" ]] && \
+ zstyle ":completion:${curcontext}:" \
+ cache-policy _python_module_caching_policy
+
+ if ( [[ ${(P)+array_name} -eq 0 ]] || _cache_invalid $cache_id ) &&
+ ! _retrieve_cache $cache_id; then
+
+ local script='import sys, pydoc
+def f(p,m,d):
+ if m.find(".") < 0: sys.stdout.write(m+"\n")
+pydoc.ModuleScanner().run(f)'
+
+ typeset -agU $array_name
+ set -A $array_name \
+ $(_call_program modules $python -c ${(q)script} 2>/dev/null)
+
+ _store_cache $cache_id $array_name
+ fi
+
+ _wanted modules expl module compadd "$@" -a -- $array_name
+}
+
+_python_modules "$@"
--
1.9.3 (Apple Git-50)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cache list of all python modules
2015-01-27 16:49 [PATCH] cache list of all python modules Jun T.
@ 2015-01-28 11:54 ` Jun T.
2015-01-28 12:03 ` Peter Stephenson
0 siblings, 1 reply; 3+ messages in thread
From: Jun T. @ 2015-01-28 11:54 UTC (permalink / raw)
To: zsh-workers
2015/01/28 01:49, Jun T. <takimoto-j@kba.biglobe.ne.jp> wrote:
> #compdef lines in _python/_pydoc are modified to use -P pattern.
Is it better to use
#compdef python -P python[0-9.]#
instead of the following?
#compdef -P python[0-9.]#
(_ruby uses the equivalent of the former)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cache list of all python modules
2015-01-28 11:54 ` Jun T.
@ 2015-01-28 12:03 ` Peter Stephenson
0 siblings, 0 replies; 3+ messages in thread
From: Peter Stephenson @ 2015-01-28 12:03 UTC (permalink / raw)
To: zsh-workers
On Wed, 28 Jan 2015 20:54:38 +0900
Jun T. <takimoto-j@kba.biglobe.ne.jp> wrote:
> 2015/01/28 01:49, Jun T. <takimoto-j@kba.biglobe.ne.jp> wrote:
>
> > #compdef lines in _python/_pydoc are modified to use -P pattern.
>
> Is it better to use
>
> #compdef python -P python[0-9.]#
>
> instead of the following?
>
> #compdef -P python[0-9.]#
...the point being -P specifies patterns to check through at the end, if
it didn't find a specific match for the "service" in the hash.
I guess it's a little bit more efficient to have the common case of
"python" optimised, but I doubt it's worth losing sleep over.
pws
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-28 12:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27 16:49 [PATCH] cache list of all python modules Jun T.
2015-01-28 11:54 ` Jun T.
2015-01-28 12:03 ` Peter Stephenson
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).