[gentoo-commits] proj/gentoo-bumpchecker:master commit in: modules/, /

[Matt Turner]

commit:     701905938a3b7fad11589830cc36c60775244bf4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 22:56:58 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 22:57:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bumpchecker.git/commit/?id=70190593

Fix some bad Python

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-bumpchecker.py         |  4 ++--
 modules/clioptions_module.py |  2 +-
 modules/gnome_module.py      |  8 ++++----
 modules/xmodular_module.py   | 12 ++++++------
 x-modular-bumpchecker.py     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnome-bumpchecker.py b/gnome-bumpchecker.py
index c14694f..6aa2470 100755
--- a/gnome-bumpchecker.py
+++ b/gnome-bumpchecker.py
@@ -12,7 +12,7 @@ version = "0.0.2"
 if __name__ == '__main__':
     import clioptions_module
     options = clioptions_module.Options()
-    if (options.options.release_number == None):
+    if options.options.release_number is None:
         options.parser.error("No revision")
 
     # generate 2 lists.
@@ -53,5 +53,5 @@ if __name__ == '__main__':
     # if we specified to generate a keywords file, generate it
     # keep in mind this will do it for the versions in portage, which
     # may not be the release versions if we are not up to date.
-    if True == options.get_arguments().keywords:
+    if options.get_arguments().keywords:
         gnome_output.Output(packages_in_portage, False).generate_keywords()

diff --git a/modules/clioptions_module.py b/modules/clioptions_module.py
index b56da67..146a788 100644
--- a/modules/clioptions_module.py
+++ b/modules/clioptions_module.py
@@ -42,6 +42,6 @@ class Options:
                            help="Force considering stable versions as latest available in Gentoo for the GNOME module.")
 
     def get_arguments(self):
-        if (self.options.output == None):
+        if self.options.output is None:
             self.parser.error("No output file")
         return self.options

diff --git a/modules/gnome_module.py b/modules/gnome_module.py
index 7a2f5ed..7280a16 100644
--- a/modules/gnome_module.py
+++ b/modules/gnome_module.py
@@ -144,12 +144,12 @@ def compare_packages(release_packages, latest_packages, packages_in_portage):
         color = None
         release_package = package
         latest_package = portage_module.findpackage(package.name, latest_packages)
-        if latest_package == None:
+        if latest_package is None:
             print("Warning: latest packages set does not have an entry for %s, using release set version %s." % (package.name, package.version))
             latest_package = package
         portage_package = portage_module.findpackage(package.name, packages_in_portage)
 
-        if portage_package == None:
+        if portage_package is None:
             status = package_module.Status.NotFound
             # we need to create a phony package since findpackage
             # returns None
@@ -166,10 +166,10 @@ def compare_packages(release_packages, latest_packages, packages_in_portage):
         else:
             status = package_module.Status.Compliant
 
-        #if portage_package != None:
+        #if portage_package is not None:
 
         # FIXME: Reports release version as latest version to not have to deal with this right now
-        if latest_package == None:
+        if latest_package is None:
             print("No latest version known for %s, FIXME!" % release_package.name)
             latest_package = release_package
 

diff --git a/modules/xmodular_module.py b/modules/xmodular_module.py
index abd8de8..2d56630 100644
--- a/modules/xmodular_module.py
+++ b/modules/xmodular_module.py
@@ -107,7 +107,7 @@ class X_modular:
                 else:
                     loc_subsubminor = int(paclist.version.split(".")[3])
 
-                if snapshots == "false" and ( ( loc_major > 98 or loc_minor > 98 or loc_subminor > 98 or loc_subsubminor > 98 ) or ( name == "pixman" and  self.is_prvocislo(loc_minor) == True ) ):
+                if snapshots == "false" and ( ( loc_major > 98 or loc_minor > 98 or loc_subminor > 98 or loc_subsubminor > 98 ) or ( name == "pixman" and  self.is_prvocislo(loc_minor) ) ):
                     continue
                 # Debuging why some package does not show correct version...
                 #if name == "xkeyboard-config":
@@ -175,14 +175,14 @@ def compare_packages(release_packages, latest_packages, packages_in_portage, sta
         portage_package = portage_module.findpackage(package.name, packages_in_portage)
         stable_portage_package = portage_module.findpackage(package.name, stable_packages_in_portage)
 
-        if stable_portage_package == None and portage_package == None:
+        if stable_portage_package is None and portage_package is None:
             status = package_module.Status.NotFound
             stable_portage_package = package_module.Package(package.name)
             portage_package = package_module.Package(package.name)
-        elif stable_portage_package == None and portage_package != None:
+        elif stable_portage_package is None and portage_package is not None:
             status = package_module.Status.StableNeedUpdate
             stable_portage_package = package_module.Package(package.name)
-        elif portage_package == None:
+        elif portage_package is None:
             status = package_module.Status.NotFound
             portage_package = package_module.Package(package.name)
         elif portage_module.best_version_test(portage_package.name_plus_version, \
@@ -197,10 +197,10 @@ def compare_packages(release_packages, latest_packages, packages_in_portage, sta
         else:
             status = package_module.Status.Compliant
 
-        #if portage_package != None:
+        #if portage_package is not None:
 
         # FIXME: Reports release version as latest version to not have to deal with this right now
-        if latest_package == None:
+        if latest_package is None:
             print "No latest version known for %s, FIXME!" % release_package.name
             latest_package = release_package
 

diff --git a/x-modular-bumpchecker.py b/x-modular-bumpchecker.py
index 409537c..1c3c822 100755
--- a/x-modular-bumpchecker.py
+++ b/x-modular-bumpchecker.py
@@ -55,5 +55,5 @@ if __name__ == '__main__':
     # if we specified to generate a keywords file, generate it
     # keep in mind this will do it for the versions in portage, which
     # may not be the release versions if we are not up to date.
-    if True == options.get_arguments().keywords:
+    if options.get_arguments().keywords:
         xmodular_output.Output(packages_in_portage, False).generate_keywords()