manual prettifying and small fixes after futurize run

5 files changed, 13 insertions, 5 deletions

diff --git a/scripts/check_sources.py b/scripts/check_sources.py
index 70013dcf..759fce72 100755
--- a/scripts/check_sources.py
+++ b/scripts/check_sources.py
@@ -10,9 +10,12 @@
     :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+
 from __future__ import print_function
 
-import sys, os, re
+import os
+import re
+import sys
 import getopt
 import cStringIO
 from os.path import join, splitext, abspath
diff --git a/scripts/find_codetags.py b/scripts/find_codetags.py
index a939c495..7da80e15 100755
--- a/scripts/find_codetags.py
+++ b/scripts/find_codetags.py
@@ -10,9 +10,12 @@
     :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+
 from __future__ import print_function
 
-import sys, os, re
+import os
+import re
+import sys
 import getopt
 from os.path import join, abspath, isdir, isfile
 
diff --git a/scripts/find_error.py b/scripts/find_error.py
index 3ee77d7d..7a513701 100755
--- a/scripts/find_error.py
+++ b/scripts/find_error.py
@@ -11,9 +11,11 @@
     :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+
 from __future__ import print_function
 
-import sys, os
+import os
+import sys
 
 # always prefer Pygments from source if exists
 srcpath = os.path.join(os.path.dirname(__file__), '..')
diff --git a/scripts/get_vimkw.py b/scripts/get_vimkw.py
index bfb26e64..4ea302f4 100644
--- a/scripts/get_vimkw.py
+++ b/scripts/get_vimkw.py
@@ -1,6 +1,5 @@
 from __future__ import print_function
 import re
-from pprint import pprint
 
 r_line = re.compile(r"^(syn keyword vimCommand contained|syn keyword vimOption "
                     r"contained|syn keyword vimAutoEvent contained)\s+(.*)")
@@ -37,7 +36,7 @@ def getkw(input, output):
 def is_keyword(w, keywords):
     for i in range(len(w), 0, -1):
         if w[:i] in keywords:
-            return signals[w[:i]][:len(w)] == w
+            return keywords[w[:i]][:len(w)] == w
     return False
 
 if __name__ == "__main__":
diff --git a/scripts/vim2pygments.py b/scripts/vim2pygments.py
index 6c33a36c..348fb852 100644..100755
--- a/scripts/vim2pygments.py
+++ b/scripts/vim2pygments.py
@@ -10,6 +10,7 @@
     :copyright 2006 by Armin Ronacher.
     :license: BSD, see LICENSE for details.
 """
+
 from __future__ import print_function
 
 import sys