Fixed a few issues found by the updated pyflakes checker. 6_1_x

Wed, 27 Jul 2016 15:38:27 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 27 Jul 2016 15:38:27 +0200
branch
6_1_x
changeset 5069
10a53320c320
parent 5066
00b319d07753
child 5071
f67ec5fa9b6f

Fixed a few issues found by the updated pyflakes checker.
(grafted from 3a5e58eeb64a218ec6e8ba88c4af37d618ab07f7)

QScintilla/Lexers/__init__.py file | annotate | diff | comparison | revisions
uninstall.py file | annotate | diff | comparison | revisions
--- a/QScintilla/Lexers/__init__.py	Wed Jul 27 13:56:37 2016 +0200
+++ b/QScintilla/Lexers/__init__.py	Wed Jul 27 15:38:27 2016 +0200
@@ -751,14 +751,6 @@
         '*.php4': "HTML",
         '*.php5': "HTML",
         '*.phtml': "HTML",
-        '*.xml': "HTML",
-        '*.xsl': "HTML",
-        '*.svg': "HTML",
-        '*.xsd': "HTML",
-        '*.xslt': "HTML",
-        '*.dtd': "HTML",
-        '*.rdf': "HTML",
-        '*.xul': "HTML",
         '*.docbook': "HTML",
         '*.ui': "HTML",
         '*.ts': "HTML",
--- a/uninstall.py	Wed Jul 27 13:56:37 2016 +0200
+++ b/uninstall.py	Wed Jul 27 15:38:27 2016 +0200
@@ -21,6 +21,8 @@
 if sys.version_info[0] == 2:
     import sip
     sip.setapi('QString', 2)
+else:
+    raw_input = input
 
 # get a local eric6config.py out of the way
 if os.path.exists("eric6config.py"):
@@ -249,12 +251,8 @@
             print("  - {0}".format(path))
         answer = "c"
         while answer not in ["y", "Y", "n", "N", ""]:
-            if sys.version_info[0] == 2:
-                answer = raw_input(
-                    "Shall these directories be removed (y/N)? ")
-            else:
-                answer = input(
-                    "Shall these directories be removed (y/N)? ")
+            answer = raw_input(
+                "Shall these directories be removed (y/N)? ")
         if answer in ["y", "Y"]:
             for path in pathsToRemove:
                 shutil.rmtree(path)
@@ -270,12 +268,8 @@
         print("  - {0}".format(cfg))
         answer = "c"
         while answer not in ["y", "Y", "n", "N", ""]:
-            if sys.version_info[0] == 2:
-                answer = raw_input(
-                    "Shall this directory be removed (y/N)? ")
-            else:
-                answer = input(
-                    "Shall this directory be removed (y/N)? ")
+            answer = raw_input(
+                "Shall this directory be removed (y/N)? ")
         if answer in ["y", "Y"]:
             shutil.rmtree(cfg)
 
@@ -302,12 +296,8 @@
         print("  - {0}".format(settingsDir))
         answer = "c"
         while answer not in ["y", "Y", "n", "N", ""]:
-            if sys.version_info[0] == 2:
-                answer = raw_input(
-                    "Shall this directory be removed (y/N)? ")
-            else:
-                answer = input(
-                    "Shall this directory be removed (y/N)? ")
+            answer = raw_input(
+                "Shall this directory be removed (y/N)? ")
         if answer in ["y", "Y"]:
             shutil.rmtree(settingsDir)
 

eric ide

mercurial