From 6bc8e0845966d0423c0129fa85bee3c4311550d7 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 21 Jun 2017 13:32:55 +0200 Subject: [PATCH] Fix pep8 reports Zero findings after this commit. We should try to keep that level. Signed-off-by: Jan Kiszka --- kas/__init__.py | 3 ++- kas/config.py | 6 +++--- kas/libcmds.py | 6 ++++-- kas/libkas.py | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kas/__init__.py b/kas/__init__.py index 804ca5b..bbea7d8 100644 --- a/kas/__init__.py +++ b/kas/__init__.py @@ -20,6 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +from .__version__ import __version__ + __license__ = 'MIT' __copyright__ = 'Copyright (c) Siemens AG, 2017' -from .__version__ import __version__ diff --git a/kas/config.py b/kas/config.py index 1101abb..0125477 100644 --- a/kas/config.py +++ b/kas/config.py @@ -199,8 +199,8 @@ class ConfigStatic(Config): (rc, output) = run_cmd(['/usr/bin/git', 'rev-parse', '--show-toplevel'], - cwd=os.path.dirname(self.filename), - env=self.environ) + cwd=os.path.dirname(self.filename), + env=self.environ) url = output.strip() r = Repo(url=url, path=url, @@ -260,7 +260,7 @@ class ConfigJson(ConfigStatic): try: with open(self.filename, 'r') as f: self._config = json.load(f) - except json.decoder.JSONDecodeError as msg: + except json.decoder.JSONDecodeError as msg: logging.error('Could not load JSON config: {}'.format(msg)) sys.exit(1) self.setup_environ() diff --git a/kas/libcmds.py b/kas/libcmds.py index d80a749..6dcef1f 100644 --- a/kas/libcmds.py +++ b/kas/libcmds.py @@ -170,7 +170,8 @@ class ReposFetch(Command): os.makedirs(os.path.dirname(repo.path), exist_ok=True) gitsrcdir = os.path.join(config.get_repo_ref_dir() or '', repo.qualified_name) - logging.debug('Looking for repo ref dir in {}'.format(gitsrcdir)) + logging.debug('Looking for repo ref dir in {}'. + format(gitsrcdir)) if config.get_repo_ref_dir() and os.path.exists(gitsrcdir): run_cmd(['/usr/bin/git', 'clone', @@ -179,7 +180,8 @@ class ReposFetch(Command): env=config.environ, cwd=config.kas_work_dir) else: - run_cmd(['/usr/bin/git', 'clone', '-q', repo.url, repo.path], + run_cmd(['/usr/bin/git', 'clone', '-q', repo.url, + repo.path], env=config.environ, cwd=config.kas_work_dir) continue diff --git a/kas/libkas.py b/kas/libkas.py index 7b2f14d..b2e6dd0 100644 --- a/kas/libkas.py +++ b/kas/libkas.py @@ -62,6 +62,7 @@ def _read_stream(stream, cb): else: break + @asyncio.coroutine def _stream_subprocess(cmd, cwd, env, shell, stdout_cb, stderr_cb): if shell: