From 1d82e52b4c768006b8ad7759a1c23f2af69c189d Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 19 Jan 2007 00:14:01 +0100 Subject: pylint cleanups --- git_buildpackage/deb_utils.py | 4 ++-- git_buildpackage/git_utils.py | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/git_buildpackage/deb_utils.py b/git_buildpackage/deb_utils.py index 0801c4d6..cdcad487 100644 --- a/git_buildpackage/deb_utils.py +++ b/git_buildpackage/deb_utils.py @@ -17,9 +17,9 @@ def parse_changelog(changelog): return None cp=email.message_from_string(output) if '-' in cp['Version']: - cp['Upstream-Version'], cp['Debian-Version'] = cp['Version'].rsplit('-',1) + cp['Upstream-Version'], cp['Debian-Version'] = cp['Version'].rsplit('-', 1) else: - cp['Debian-Version']=cp['Version'] + cp['Debian-Version'] = cp['Version'] return cp diff --git a/git_buildpackage/git_utils.py b/git_buildpackage/git_utils.py index fa7fe38d..0c561958 100644 --- a/git_buildpackage/git_utils.py +++ b/git_buildpackage/git_utils.py @@ -5,7 +5,6 @@ import subprocess import os.path -import re class GitRepositoryError(Exception): pass @@ -19,7 +18,7 @@ class GitRepository(object): os.stat(os.path.join(path,'.git')) except: raise GitRepositoryError - self.path=os.path.abspath(path) + self.path = os.path.abspath(path) def __check_path(self): @@ -29,7 +28,7 @@ class GitRepository(object): def __git_getoutput(self, command): """Exec a git command and return the output""" - popen = subprocess.Popen(['git',command], stdout=subprocess.PIPE) + popen = subprocess.Popen(['git', command], stdout=subprocess.PIPE) popen.wait() return popen.stdout.readlines() @@ -38,7 +37,7 @@ class GitRepository(object): """check if the repository has branch 'branch'""" self.__check_path() for line in self.__git_getoutput('branch'): - if line.split(' ',1)[1].strip() == branch: + if line.split(' ', 1)[1].strip() == branch: return True return False @@ -48,27 +47,27 @@ class GitRepository(object): self.__check_path() for line in self.__git_getoutput('branch'): if line.startswith('*'): - return line.split(' ',1)[1].strip() + return line.split(' ', 1)[1].strip() def is_clean(self): """does the repository contain any uncommitted modifications""" self.__check_path() - clean_msg='nothing to commit' + clean_msg = 'nothing to commit' out = self.__git_getoutput('status') if out[0].strip() == clean_msg: - ret=True + ret = True elif out[0].startswith('#') and out[1].strip() == clean_msg: - ret=True + ret = True else: - ret=False + ret = False return (ret, "".join(out)) def sanitize_version(version): """sanitize a version so git accepts it as a tag""" if ':' in version: # strip of any epochs - version=version.split(':',1)[1] - return version.replace('~','.') + version=version.split(':', 1)[1] + return version.replace('~', '.') # vim:et:ts=4:sw=4: -- cgit v1.2.3