From f33ece11ace7e91fb021d2db43f76d2bb46fba19 Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Sun, 9 Oct 2016 18:42:55 -0700 Subject: [PATCH] simplify invoking create_manpage_completions.py My previous change to avoid creating a *.pyc file when running create_manpage_completions.py was wrong because I put the `sys.dont_write_bytecode = True` on the wrong line. Rather than simply move that statement make the simpler, cleaner, fix that removes the need for `eval` where that program is invoked. --- share/functions/fish_update_completions.fish | 2 +- share/tools/create_manpage_completions.py | 1 - share/tools/deroff.py | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/share/functions/fish_update_completions.fish b/share/functions/fish_update_completions.fish index 5928b3784..17b47ecb9 100644 --- a/share/functions/fish_update_completions.fish +++ b/share/functions/fish_update_completions.fish @@ -1,4 +1,4 @@ function fish_update_completions --description "Update man-page based completions" # Clean up old paths - eval (string escape $__fish_datadir/tools/create_manpage_completions.py) --manpath --progress --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions' + python -B $__fish_datadir/tools/create_manpage_completions.py --manpath --progress --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions' end diff --git a/share/tools/create_manpage_completions.py b/share/tools/create_manpage_completions.py index 837760262..a65c057bb 100755 --- a/share/tools/create_manpage_completions.py +++ b/share/tools/create_manpage_completions.py @@ -20,7 +20,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND import string, sys, re, os.path, bz2, gzip, traceback, getopt, errno, codecs from deroff import Deroffer -sys.dont_write_bytecode = True lzma_available = True try: try: diff --git a/share/tools/deroff.py b/share/tools/deroff.py index f0fe1be6c..4ef4fb690 100755 --- a/share/tools/deroff.py +++ b/share/tools/deroff.py @@ -3,10 +3,8 @@ """ Deroff.py, ported to Python from the venerable deroff.c """ - import sys, re, string -sys.dont_write_bytecode = True IS_PY3 = sys.version_info[0] >= 3 class Deroffer: