commit: b48733ee81b9d68ef1629f772071924142979e31
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 6 15:02:47 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 6 15:02:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b48733ee
lint: clean up superfluous parens
These don't need the parens, so omit them.
In the case of setup.py, we were expecting a print function, not a
keyword, so make sure to import that module.
catalyst/lock.py | 6 +++---
doc/make_subarch_table_guidexml.py | 6 +++---
setup.py | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/catalyst/lock.py b/catalyst/lock.py
index d079b2d..3d50c06 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -179,7 +179,7 @@ class LockDir(object):
if not os.path.exists(self.lockfile):
print "lockfile does not exist '%s'" % self.lockfile
#print "fcntl_unlock() , self.myfd:", self.myfd,
type(self.myfd)
- if (self.myfd != None):
+ if self.myfd != None:
#print "fcntl_unlock() trying to close it "
try:
os.close(self.myfd)
@@ -236,7 +236,7 @@ class LockDir(object):
#if type(lockfilename) ==
types.StringType:
# os.close(myfd)
#print "fcntl_unlock() trying a last ditch close", self.myfd
- if (self.myfd != None):
+ if self.myfd != None:
os.close(self.myfd)
self.myfd=None
self.locked=False
@@ -256,7 +256,7 @@ class LockDir(object):
start_time = time.time()
reported_waiting = False
- while(time.time() < (start_time + max_wait)):
+ while time.time() < (start_time + max_wait):
# We only need it to exist.
self.myfd = os.open(self.myhardlock,
os.O_CREAT|os.O_RDWR,0660)
os.close(self.myfd)
diff --git a/doc/make_subarch_table_guidexml.py
b/doc/make_subarch_table_guidexml.py
index 54e0a4a..a6a9022 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -30,7 +30,7 @@ def handle_line(line, subarch_title_to_subarch_id,
subarch_id_to_pattern_arch_ge
# Apply alias grouping
arch = _pattern_arch_genericliases.get(arch, arch)
- assert(subarch not in subarch_id_to_pattern_arch_genericrch_id)
+ assert subarch not in subarch_id_to_pattern_arch_genericrch_id
subarch_id_to_pattern_arch_genericrch_id[subarch] = arch
return
@@ -40,7 +40,7 @@ def handle_line(line, subarch_title_to_subarch_id,
subarch_id_to_pattern_arch_ge
child_subarch = x.group(1)
parent_subarch = x.group(2)
- assert(child_subarch not in
subarch_id_to_pattern_arch_genericrch_id)
+ assert child_subarch not in
subarch_id_to_pattern_arch_genericrch_id
subarch_id_to_pattern_arch_genericrch_id[child_subarch] =
subarch_id_to_pattern_arch_genericrch_id[parent_subarch]
return
@@ -49,7 +49,7 @@ def handle_line(line, subarch_title_to_subarch_id,
subarch_id_to_pattern_arch_ge
subarch_title = x.group(1)
subarch_id = x.group(2)
- assert(subarch_title not in subarch_title_to_subarch_id)
+ assert subarch_title not in subarch_title_to_subarch_id
subarch_title_to_subarch_id[subarch_title] = subarch_id
diff --git a/setup.py b/setup.py
index e4569ee..a875db1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
"""Catalyst is a release building tool used by Gentoo Linux"""
+from __future__ import print_function
import codecs as _codecs
from distutils.core import setup as _setup, Command as _Command
