Mercurial Repositories > eric / file diff

--- a/install.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/install.py	Tue Mar 07 19:46:57 2017 +0100
@@ -1231,12 +1231,12 @@
         if "snapshot" not in sipVersion and "dev" not in sipVersion:
             while sipVersion.count('.') < 2:
                 sipVersion += '.0'
-            (maj, min, pat) = sipVersion.split('.')
-            maj = int(maj)
-            min = int(min)
+            (major, minor, pat) = sipVersion.split('.')
+            major = int(major)
+            minor = int(minor)
             pat = int(pat)
-            if maj < 4 or (maj == 4 and min < 14) or \
-                    (maj == 4 and min == 14 and pat < 2):
+            if major < 4 or (major == 4 and minor < 14) or \
+                    (major == 4 and minor == 14 and pat < 2):
                 print('Sorry, you must have sip 4.14.2 or higher or'
                       ' a recent snapshot release.')
                 exit(3)
@@ -1262,13 +1262,13 @@
     if "snapshot" not in pyqtVersion and "dev" not in pyqtVersion:
         while pyqtVersion.count('.') < 2:
             pyqtVersion += '.0'
-        (maj, min, pat) = pyqtVersion.split('.')
-        maj = int(maj)
-        min = int(min)
+        (major, minor, pat) = pyqtVersion.split('.')
+        major = int(major)
+        minor = int(minor)
         pat = int(pat)
-        if maj < 4 or \
-            (maj == 4 and min < 10) or \
-                (maj == 5 and min < 3):
+        if major < 4 or \
+            (major == 4 and minor < 10) or \
+                (major == 5 and minor < 3):
             print('Sorry, you must have PyQt 4.10.0 or better or')
             print('PyQt 5.3.0 or better or'
                   ' a recent snapshot release.')
@@ -1292,11 +1292,11 @@
     if "snapshot" not in scintillaVersion and "dev" not in scintillaVersion:
         while scintillaVersion.count('.') < 2:
             scintillaVersion += '.0'
-        (maj, min, pat) = scintillaVersion.split('.')
-        maj = int(maj)
-        min = int(min)
+        (major, minor, pat) = scintillaVersion.split('.')
+        major = int(major)
+        minor = int(minor)
         pat = int(pat)
-        if maj < 2 or (maj == 2 and min < 8):
+        if major < 2 or (major == 2 and minor < 8):
             print('Sorry, you must have QScintilla 2.8.0 or higher or'
                   ' a recent snapshot release.')
             exit(5)