[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/herds/, pym/repoman/modules/commit/, pym/repoman/

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/herds/, pym/repoman/modules/commit/, pym/repoman/

[Michał Górny]

commit:     d85d4698d734fca4cd6bbe1948da617ff978bf38
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 11:42:39 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 14:45:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d85d4698

repoman: Fix up pyflakes imports and undefined functions or values

 pym/repoman/_xml.py                      |  5 +----
 pym/repoman/checks/herds/herdbase.py     |  2 ++
 pym/repoman/copyrights.py                | 10 ++++------
 pym/repoman/modules/commit/repochecks.py |  2 --
 pym/repoman/profile.py                   |  3 ++-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index 1871875..b97c027 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -55,7 +55,6 @@ class XmlLint(object):
 		self.binary = None
 		self._check_capable(options, repolevel, repoman_settings)
 
-
 	def _check_capable(self, options, repolevel, repoman_settings):
 		if options.mode == "manifest":
 			return
@@ -71,15 +70,13 @@ class XmlLint(object):
 			# this can be problematic if xmllint changes their output
 			self._is_capable = True
 
-
 	@property
 	def capable(self):
 		return self._is_capable
 
-
 	def check(self, checkdir):
 		if not self.capable:
-			return true
+			return True
 		# xmlint can produce garbage output even on success, so only dump
 		# the ouput when it fails.
 		st, out = repoman_getstatusoutput(

diff --git a/pym/repoman/checks/herds/herdbase.py b/pym/repoman/checks/herds/herdbase.py
index b1ba671..cfa37e4 100644
--- a/pym/repoman/checks/herds/herdbase.py
+++ b/pym/repoman/checks/herds/herdbase.py
@@ -24,6 +24,8 @@ from portage import _encodings, _unicode_encode
 from portage.exception import FileNotFound, ParseError, PermissionDenied
 from portage import os
 
+from repoman.errors import err
+
 __all__ = [
 	"make_herd_base", "get_herd_base"
 ]

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 01ce42f..056cfda 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -87,11 +87,11 @@ def update_copyright(fn_path, year, pretend=False):
 		new_header.append(line)
 
 	difflines = 0
-	for line in difflib.unified_diff(
-		[_unicode_decode(line) for line in orig_header],
-		[_unicode_decode(line) for line in new_header],
+	for diffline in difflib.unified_diff(
+		[_unicode_decode(diffline) for diffline in orig_header],
+		[_unicode_decode(diffline) for diffline in new_header],
 		fromfile=fn_path, tofile=fn_path, n=0):
-		util.writemsg_stdout(line, noiselevel=-1)
+		util.writemsg_stdout(diffline, noiselevel=-1)
 		difflines += 1
 	util.writemsg_stdout("\n", noiselevel=-1)
 
@@ -117,5 +117,3 @@ def update_copyright(fn_path, year, pretend=False):
 		else:
 			util.apply_stat_permissions(fn_path, fn_stat)
 	fn_hdl.close()
-
-

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index d0e2f28..2839864 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -1,9 +1,7 @@
 
-
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import vcs
 from repoman.vcs.vcs import detect_vcs_conflicts
 
 

diff --git a/pym/repoman/profile.py b/pym/repoman/profile.py
index 03e6c24..11b93c7 100644
--- a/pym/repoman/profile.py
+++ b/pym/repoman/profile.py
@@ -1,6 +1,7 @@
 
-from portage import os
 from portage import normalize_path
+from portage import os
+from portage.output import red
 
 
 class ProfileDesc(object):