From f4fc1307e277dae4a3c8c4fd4945d16b6bc3ece0 Mon Sep 17 00:00:00 2001
From: Jens Kleineheismann <heinzel@farbemachtstark.de>
Date: Tue, 29 Oct 2019 18:50:41 +0100
Subject: [PATCH] Try to satisfy pylint and tox:py2

---
 .pylintrc                               |  1 +
 src/django_deploy/main.py               |  2 +-
 src/django_deploy/program.py            | 10 +++++-----
 src/django_deploy/tests/test_program.py |  6 +++++-
 tox.ini                                 |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index bfd1a4a..210b081 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -18,6 +18,7 @@ good-names=_,
            c,
            d,
            e,
+           f,
            i,
            j,
            k,
diff --git a/src/django_deploy/main.py b/src/django_deploy/main.py
index a2ce4fd..c085f9e 100644
--- a/src/django_deploy/main.py
+++ b/src/django_deploy/main.py
@@ -6,4 +6,4 @@ from .program import Program
 def main(*args, **kwargs):
     program = Program()
     exitval = program(*args, **kwargs)
-    sys.exit(exitval)
+    sys.exit(exitval)  # pragma: no cover
diff --git a/src/django_deploy/program.py b/src/django_deploy/program.py
index 13151a1..0967943 100644
--- a/src/django_deploy/program.py
+++ b/src/django_deploy/program.py
@@ -71,16 +71,16 @@ class Program(object):  # pylint: disable=too-few-public-methods
         sys.path.pop(0)
 
         missing_apps = []
-        for app in add_apps:
-            if app not in settings.INSTALLED_APPS:
-                missing_apps.append(app)
+        for add_app in add_apps:
+            if add_app not in settings.INSTALLED_APPS:
+                missing_apps.append(add_app)
 
         if missing_apps:
             sys.stdout.write('{app}: adding {apps} to INSTALLED_APPS\n'.format(app=app, apps=missing_apps))
             comment = '### {app}: added apps with django-deploy at {timestamp}'
             code = 'INSTALLED_APPS += [\n'
-            for app in missing_apps:
-                code += '    \'{}\',\n'.format(app)
+            for add_app in missing_apps:
+                code += '    \'{}\',\n'.format(add_app)
             code += ']\n'
 
             append_text = '\n' + comment + '\n' + code + '\n'
diff --git a/src/django_deploy/tests/test_program.py b/src/django_deploy/tests/test_program.py
index c71dbe3..589cd33 100644
--- a/src/django_deploy/tests/test_program.py
+++ b/src/django_deploy/tests/test_program.py
@@ -3,6 +3,10 @@ import os
 import sys
 import unittest
 import pytest
+try:
+    from importlib import reload
+except ImportError:
+    pass
 
 from ..config import DJANGO_SETTINGS_MODULE_NAME
 from ..program import Program
@@ -64,6 +68,6 @@ class MainTestCase(unittest.TestCase):
         settings_dir = os.path.join(project_dir, DJANGO_SETTINGS_MODULE_NAME)
         sys.path.insert(0, settings_dir)
         settings = importlib.import_module('settings')
-        importlib.reload(settings)
+        reload(settings)
         sys.path.pop(0)
         self.assertListEqual(expected_installed_apps, settings.INSTALLED_APPS)
diff --git a/tox.ini b/tox.ini
index 7e6a0a3..8bbe24d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,5 +6,5 @@ deps = coverage
        pylint
        pytest
 commands = coverage run -m pytest
-           coverage report --skip-covered
+           coverage report --skip-covered --fail-under=99
            pylint django_deploy