Merge ppa-dev-tools:make-check-fixes into ppa-dev-tools:main

[Bryce Harrington]

Cleanup to prep for 0.2 release.

[Christian Ehrhardt  (paelzer)]

Really seems to be just cleanups, whitespace lines, line length, f-string, import order and useless imports ... the stuff you know from your friendly linters.

I didn't see anything odd, therefore +1 to this

review: Approve

[Bryce Harrington (bryce)]

Excellent, thanks

diff --git a/ppa/debug.py b/ppa/debug.py
index 8339e73..009ead4 100644
--- a/ppa/debug.py
+++ b/ppa/debug.py
@@ -13,6 +13,7 @@ import pprint
 
 DEBUGGING = False
 
+
 def dbg(msg):
     """Prints information if debugging is enabled"""
     if DEBUGGING:
@@ -21,10 +22,12 @@ def dbg(msg):
         else:
             pprint.pprint(msg)
 
+
 def warn(msg):
     """Prints message to stderr"""
     sys.stderr.write("Warning: {}\n".format(msg))
 
+
 def die(msg, code=1):
     """Prints message to stderr and exits with given code"""
     sys.stderr.write("Error: {}\n".format(msg))
diff --git a/ppa/job.py b/ppa/job.py
index 2ae06ba..91f015c 100755
--- a/ppa/job.py
+++ b/ppa/job.py
@@ -148,9 +148,9 @@ def show_running(jobs):
         if n == 1:
             print("Running:")
             ppa_str = ','.join(e.ppas)
-            trigger_str = ','.join(e.triggers)
+            trig_str = ','.join(e.triggers)
             print(rformat % ("time", "pkg", "release", "arch", "ppa", "trigger"))
-        print(rformat % (str(e.submit_time), e.source_package, e.series, e.arch, ppa_str, trigger_str))
+        print(rformat % (str(e.submit_time), e.source_package, e.series, e.arch, ppa_str, trig_str))
     if n == 0:
         print("Running: (none)")
 
@@ -164,7 +164,10 @@ def show_waiting(jobs):
         if n == 1:
             print("Waiting:")
             print(rformat % ("Q-num", "pkg", "release", "arch", "ppa", "trigger"))
-        print(rformat % (e.number, e.source_package, e.series, e.arch, ','.join(e.ppas), ','.join(e.triggers)))
+
+        ppa_str = ','.join(e.ppas)
+        trig_str = ','.join(e.triggers)
+        print(rformat % (e.number, e.source_package, e.series, e.arch, ppa_str, trig_str))
     if n == 0:
         print("Waiting: (none)")
 
@@ -178,8 +181,8 @@ if __name__ == "__main__":
     root_dir = os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..'))
     jobinfo = {
         'triggers': ['a/1', 'b/2.1', 'c/3.2.1'],
-        'ppas': ['ppa:me/myppa'],
-        }
+        'ppas': ['ppa:me/myppa']
+    }
     job_1 = Job(
         number=0,
         submit_time='time',
@@ -188,7 +191,7 @@ if __name__ == "__main__":
         arch='amd64',
         triggers=jobinfo.get('triggers', None),
         ppas=jobinfo.get('ppas', None)
-        )
+    )
     print(job_1)
     print(f"triggers:     {job_1.triggers}")
     print(f"ppas:         {job_1.ppas}")
diff --git a/ppa/lp.py b/ppa/lp.py
index c3ebaac..1762345 100644
--- a/ppa/lp.py
+++ b/ppa/lp.py
@@ -14,12 +14,12 @@
 High level wrapper object for Launchpad's API
 """
 
-from os.path import join
 from contextlib import suppress
 from functools import lru_cache
 
 from launchpadlib.launchpad import Launchpad
 
+
 class Lp:
     """
     This class wrappers the Launchpadlib service to cache object queries
@@ -32,8 +32,8 @@ class Lp:
     itself is passed directly to the Launchpadlib object, so the entire
     API is available in exactly the same way.
     """
-    ROOT_URL      = 'https://launchpad.net/'
-    API_ROOT_URL  = 'https://api.launchpad.net/devel/'
+    ROOT_URL = 'https://launchpad.net/'
+    API_ROOT_URL = 'https://api.launchpad.net/devel/'
     BUGS_ROOT_URL = 'https://bugs.launchpad.net/'
     CODE_ROOT_URL = 'https://code.launchpad.net/'
 
@@ -68,7 +68,7 @@ class Lp:
 
     def __getattr__(self, attr):
         """Wrap launchpadlib so tightly you can't tell the difference."""
-        assert not attr.startswith('_'), "Can't getattr for %s" %(attr)
+        assert not attr.startswith('_'), f"Can't getattr for {attr}"
         instance = super(Lp, self).__getattribute__('_instance')
         return getattr(instance, attr)
 
diff --git a/ppa/ppa.py b/ppa/ppa.py
index 6f744a4..763ed7f 100755
--- a/ppa/ppa.py
+++ b/ppa/ppa.py
@@ -44,7 +44,7 @@ def ppa_address_split(ppa_address, default_team='me'):
     if ppa_address.startswith('ppa:'):
         if '/' not in ppa_address:
             return (None, None)
-        rem = ppa_address.split('ppa:',1)[1]
+        rem = ppa_address.split('ppa:', 1)[1]
         team_name = rem.split('/', 1)[0]
         ppa_name = rem.split('/', 1)[1]
     else:
@@ -193,7 +193,7 @@ class Ppa:
         :returns: List of architecture names, or None on error.
         """
         try:
-            return [ proc.name for proc in self.archive.processors ]
+            return [proc.name for proc in self.archive.processors]
         except PpaDoesNotExist as e:
             print(e)
             return None
@@ -208,7 +208,7 @@ class Ppa:
         :returns: List of architecture names, or None on error.
         """
         uri_base = "https://api.launchpad.net/devel/+processors/{}"
-        procs = [ uri_base.format(arch) for arch in architectures ]
+        procs = [uri_base.format(arch) for arch in architectures]
         try:
             self.archive.setProcessors(processors=procs)
             return True
@@ -225,7 +225,7 @@ class Ppa:
         :rtype: list[binary_package_publishing_history]
         :returns: List of binaries, or None on error
         """
-        if distro == None and series == None and arch == None:
+        if distro is None and series is None and arch is None:
             try:
                 return self.archive.getPublishedBinaries()
             except PpaDoesNotExist as e:
@@ -323,7 +323,9 @@ class Ppa:
                 published_builds[binary_publication.build_link] = binary_publication
 
         retval = False
-        num_builds_waiting = len(required_builds) - len(pending_publication_builds) - len(published_builds)
+        num_builds_waiting = (
+            len(required_builds) - len(pending_publication_builds) - len(published_builds)
+        )
         if num_builds_waiting != 0:
             num_build_failures = 0
             builds_waiting_output = ''
@@ -353,12 +355,14 @@ class Ppa:
             retval = True
 
         if len(pending_publication_builds) != 0:
-            print("* Still waiting on {} build publications:".format(len(pending_publication_builds)))
+            num = len(pending_publication_builds)
+            print(f"* Still waiting on {num} build publications:")
             for pub in pending_publication_builds.values():
                 print("  - {}".format(pub.display_name))
             retval = True
         if len(pending_publication_sources) != 0:
-            print("* Still waiting on {} source publications:".format(len(pending_publication_sources)))
+            num = len(pending_publication_sources)
+            print(f"* Still waiting on {num} source publications:")
             for pub in pending_publication_sources.values():
                 print("  - {}".format(pub.display_name))
             retval = True
diff --git a/ppa/ppa_group.py b/ppa/ppa_group.py
index cb769ad..1a9c8b7 100755
--- a/ppa/ppa_group.py
+++ b/ppa/ppa_group.py
@@ -14,6 +14,7 @@ from .text import o2str
 from functools import lru_cache
 from lazr.restfulclient.errors import BadRequest
 
+
 class PpaAlreadyExists(BaseException):
     '''Exception indicating a PPA operation could not be performed'''
 
@@ -34,7 +35,8 @@ class PpaAlreadyExists(BaseException):
         if self.message:
             return self.message
         elif self.ppa_name:
-            return "The PPA %s already exists" %(self.ppa_name)
+            return f"The PPA {self.ppa_name} already exists"
+
 
 class PpaGroup:
     """Represents a team or person that owns one or more PPAs.
@@ -58,7 +60,7 @@ class PpaGroup:
 
     def __repr__(self):
         return (f'{self.__class__.__name__}('
-		f'service={self.service!r}, name={self.name!r})')
+                f'service={self.service!r}, name={self.name!r})')
 
     def __str__(self):
         return 'tbd'
@@ -91,7 +93,7 @@ class PpaGroup:
             ppa_displayname = ppa_name
 
         try:
-            results = self.team.createPPA(
+            self.team.createPPA(
                 name=ppa_name,
                 description=ppa_description,
                 displayname=ppa_displayname)
diff --git a/ppa/processes.py b/ppa/processes.py
index e008c0c..5f54e39 100644
--- a/ppa/processes.py
+++ b/ppa/processes.py
@@ -28,7 +28,6 @@ from subprocess import (Popen, PIPE)
 from .debug import dbg
 from .text import o2str
 
-# TODO: Integrate use of dbg and ERR from utils
 
 class ReturnCode(BaseException):
     def __init__(self, code, errors=None):
@@ -40,11 +39,12 @@ class ReturnCode(BaseException):
 
     def __str__(self):
         text = '\n'.join(self.errors)
-        return "%sReturned error code %d" %(text, self.code)
+        return f"{text}Returned error code {self.code}"
+
 
 def shell(command, in_text=None):
     """Executes command in a shell, returns stdout, raises exception on error"""
-    dbg("shell: %s" %(command))
+    dbg(f"shell: {command}")
     if in_text:
         p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE, stdin=PIPE)
         output, errors = p.communicate(input=in_text)
@@ -55,14 +55,15 @@ def shell(command, in_text=None):
         raise ReturnCode(p.returncode, o2str(errors))
     return o2str(output)
 
+
 def execute(command, in_text=None):
     """Executes command, returns stdout; prints errors to stderr"""
-    dbg("execute: `%s`" %(command))
+    dbg(f"execute: `{command}`")
     if in_text is None:
         p = Popen(command, shell=False, stdout=PIPE, stderr=PIPE)
     else:
         p = Popen(command, shell=False, stdout=PIPE, stderr=PIPE, stdin=PIPE)
-        dbg("execute: polling (%s)..." %(in_text))
+        dbg(f"execute: polling ({in_text})...")
         while p.poll() is None and p.stdin is not None:
             dbg("execute: Sending to process stdin")
             p.stdin.write(in_text)
@@ -70,10 +71,11 @@ def execute(command, in_text=None):
             sleep(0.01)
     output = p.stdout.read()
     if p.returncode:
-        dbg("Received return code %d" %(p.returncode))
+        dbg(f"Received return code {p.returncode}")
         raise ReturnCode(p.returncode, p.stderr.readlines())
     return o2str(output)
 
+
 def execute_with_input(command, in_text):
     """Executes command, passing in_text to stdin if provided"""
     execute(command, in_text)
diff --git a/ppa/result.py b/ppa/result.py
index 7a2ca5a..4f4aadd 100755
--- a/ppa/result.py
+++ b/ppa/result.py
@@ -30,7 +30,7 @@ class Result:
     VALUES = {
         'PASS': "✅",
         'FAIL': "❌",
-        'BAD':  "⛔",
+        'BAD': "⛔"
     }
 
     def __init__(self, url, time, series, arch, source):
@@ -145,7 +145,6 @@ class Result:
             package, version = t.split('/', 1)
             yield Trigger(package, version, arch=self.arch, series=self.series)
 
-
     @lru_cache
     def get_subtests(self, name=None) -> Iterator[Subtest]:
         """Provides list of Subtests that were run for this Result.
diff --git a/ppa/subtest.py b/ppa/subtest.py
index c63dda6..90134b8 100755
--- a/ppa/subtest.py
+++ b/ppa/subtest.py
@@ -12,7 +12,6 @@
 """An individual DEP8 test run"""
 
 from functools import cached_property
-from typing import List, Iterator
 
 
 class Subtest:
@@ -25,9 +24,9 @@ class Subtest:
         'PASS': "🟩",
         'SKIP': "🟧",
         'FAIL': "🟥",
-        'BAD':  "⛔",
+        'BAD': "⛔",
         'UNKNOWN': "⚪"
-        }
+    }
 
     def __init__(self, line):
         """Initializes a new Subtext object.
diff --git a/ppa/text.py b/ppa/text.py
index fb8c558..b1e1453 100644
--- a/ppa/text.py
+++ b/ppa/text.py
@@ -24,9 +24,11 @@
 
 '''Routines to encode or convert to and from text'''
 
-from decimal   import Decimal
+import sys
+from decimal import Decimal
 from functools import lru_cache
 
+
 @lru_cache
 def quote(msg):
     """
@@ -39,13 +41,14 @@ def quote(msg):
     msg = msg.replace('>', '>')
     return msg
 
+
 @lru_cache
 def o2str(obj):
     """
     Convert a unicode, decimal.Decimal, datetime object, etc. to a str.
     Converts lists and tuples of objects into lists of strings.
     """
-    retval = None
+
     if type(obj) == str:
         return obj
     elif type(obj) == bytes:
@@ -60,9 +63,10 @@ def o2str(obj):
     elif str(type(obj)) == "<type 'datetime.datetime'>":
         return obj.ctime()
     else:
-        #print str(type(obj))
+        # print str(type(obj))
         return obj
 
+
 @lru_cache
 def to_bool(value):
     """
@@ -70,14 +74,15 @@ def to_bool(value):
     Possible True  values: 1, True, '1', 'TRue', 'yes', 'y', 't'
     Possible False values: 0, False, None, [], {}, '', '0', 'faLse', 'no', 'n', 'f', 0.0
     """
-    if type(value) == type(''):
-        if value.lower() in ("yes", "y", "true",  "t", "1"):
+    if isinstance(value, str):
+        if value.lower() in ("yes", "y", "true", "t", "1"):
             return True
-        if value.lower() in ("no",  "n", "false", "f", "0", "none", ""):
+        if value.lower() in ("no", "n", "false", "f", "0", "none", ""):
             return False
         raise Exception('Invalid value for boolean conversion: ' + value)
     return bool(value)
 
+
 @lru_cache
 def o2float(value):
     '''Converts strings like 42%, 123M, 1.2B into floating point numbers
@@ -93,21 +98,21 @@ def o2float(value):
     elif value == '--':
         return 0.0
 
-    value = value.replace(',','')
-    last = value[len(value)-1]
+    value = value.replace(',', '')
+    last = value[len(value) - 1]
     if last == 'M':
         return float(value[:-1])
     elif last == 'B':
         return float(value[:-1]) * 1000
     elif last == '%':
-        return float(value[:-1])/100.0
+        return float(value[:-1]) / 100.0
     elif last == ')' and value[0] == '(':
         return -1 * o2float(value[1:-1])
 
     try:
         return float(value)
     except ValueError:
-        sys.stderr.write("ofloat: Could not convert '%s' to float\n" %(value))
+        sys.stderr.write(f"ofloat: Could not convert '{value}' to float\n")
         raise
 
 
@@ -132,10 +137,10 @@ if __name__ == "__main__":
         ({}, False),
         ((), False),
         ([1], True),
-        ({1:2}, True),
+        ({1: 2}, True),
         ((1,), True),
         (None, False),
         (object(), True),
-        ]
+    ]
     for test, expected in test_cases:
-        assert to_bool(test) == expected, "to_bool("+test+") failed to return "+expected
+        assert to_bool(test) == expected, f"to_bool({test}) failed to return {expected}"
diff --git a/tests/test_lp.py b/tests/test_lp.py
index a8fcdcb..d5978ce 100644
--- a/tests/test_lp.py
+++ b/tests/test_lp.py
@@ -30,7 +30,7 @@ Tests for our launchpadlib wrapper & helper methods.
 import sys
 import os.path
 
-from mock import Mock, patch
+from mock import Mock
 import pytest
 import logging
 
@@ -41,6 +41,7 @@ from launchpadlib.launchpad import Launchpad
 
 APPNAME = 'test-lp'
 
+
 @pytest.fixture
 def fakelp(tmp_path):
     """Connect to Launchpad."""
@@ -71,16 +72,19 @@ def test_new_connection(tmp_path):
         version='devel',
     )
 
+
 def test_api_root(fakelp):
     """Ensure we can get LP's API root."""
     fakelp.load(Lp.API_ROOT_URL + 'hi')
     fakelp._instance.load.assert_called_once_with(
         'https://api.launchpad.net/devel/hi')
 
+
 def test_ubuntu(fakelp):
-    fakelp._instance.distributions={'ubuntu': 'UBUNTU'}
+    fakelp._instance.distributions = {'ubuntu': 'UBUNTU'}
     assert fakelp.ubuntu == 'UBUNTU'
 
+
 def test_ubuntu_active_series(fakelp):
     mock_hirsute = Mock(active=False)
     mock_hirsute.name = 'hirsute'
@@ -93,10 +97,12 @@ def test_ubuntu_active_series(fakelp):
     assert fakelp.ubuntu_active_series()[0] == mock_jammy
     assert fakelp.ubuntu_active_series()[0].name == 'jammy'
 
+
 def test_debian(fakelp):
-    fakelp._instance.distributions={'debian': 'DEBIAN'}
+    fakelp._instance.distributions = {'debian': 'DEBIAN'}
     assert fakelp.debian == 'DEBIAN'
 
+
 def test_debian_active_series(fakelp):
     mock_woody = Mock(active=False)
     mock_woody.name = 'woody'
@@ -111,6 +117,7 @@ def test_debian_active_series(fakelp):
     fakelp._instance.distributions = {'debian': mock_debian}
     assert fakelp.debian_active_series()[0].name == 'buster'
 
+
 def test_debian_experimental_series(fakelp):
     mock_woody = Mock(active=False)
     mock_woody.name = 'woody'
@@ -125,6 +132,7 @@ def test_debian_experimental_series(fakelp):
     fakelp._instance.distributions = {'debian': mock_debian}
     assert fakelp.debian_experimental_series() == mock_sid
 
+
 def test_ppa_team(fakelp):
     """Return the PPA team object."""
     mock_me = Mock(memberships_details=[
diff --git a/tests/test_ppa.py b/tests/test_ppa.py
index a632228..a71336f 100644
--- a/tests/test_ppa.py
+++ b/tests/test_ppa.py
@@ -11,10 +11,8 @@
 import os
 import sys
 
-import pytest
-
 sys.path.insert(0, os.path.realpath(
-        os.path.join(os.path.dirname(__file__), "..")))
+    os.path.join(os.path.dirname(__file__), "..")))
 
 from ppa.ppa import Ppa
 
@@ -24,12 +22,14 @@ def test_object():
     ppa = Ppa('test-ppa-name', 'test-team-name')
     assert ppa
 
+
 def test_description():
     """Check specifying a description when creating a PPA"""
     ppa = Ppa('test-ppa-name', 'test-team-name', 'test-description')
 
     assert 'test-description' in ppa.ppa_description
 
+
 def test_address():
     """Check getting the PPA address"""
     ppa = Ppa('test', 'team')
diff --git a/tests/test_ppa_group.py b/tests/test_ppa_group.py
index dd45e80..e03a841 100644
--- a/tests/test_ppa_group.py
+++ b/tests/test_ppa_group.py
@@ -14,11 +14,12 @@ import sys
 import pytest
 
 sys.path.insert(0, os.path.realpath(
-        os.path.join(os.path.dirname(__file__), "..")))
+    os.path.join(os.path.dirname(__file__), "..")))
 
 from ppa.ppa import Ppa
 from ppa.ppa_group import PpaGroup, PpaAlreadyExists
 
+
 class PersonMock:
     def __init__(self, name):
         self.name = name
@@ -42,10 +43,10 @@ class PersonMock:
 
 class LaunchpadMock:
     def __init__(self):
-        self.people = { 'me': PersonMock('me') }
+        self.people = {'me': PersonMock('me')}
 
     def add_person(self, name):
-        print("Adding person %s" %(name))
+        print(f"Adding person {name}")
         self.people[name] = PersonMock(name)
 
     @property
@@ -83,6 +84,7 @@ def test_object():
     ppa_group = PpaGroup(service=LpServiceMock())
     assert(ppa_group)
 
+
 def test_create_ppa():
     """Checks that PpaGroups can create PPAs"""
     name = 'test_ppa'
@@ -92,13 +94,15 @@ def test_create_ppa():
     assert(name in ppa.address)
     assert(type(ppa.description) is str)
 
+
 def test_create_existing_ppa():
     """Check exception creating an already created PPA"""
     name = 'test_ppa'
     ppa_group = PpaGroup(service=LpServiceMock())
-    ppa = ppa_group.create(name)
+    ppa_group.create(name)
     with pytest.raises(PpaAlreadyExists):
-        ppa = ppa_group.create(name)
+        ppa_group.create(name)
+
 
 def test_create_with_description():
     """Check setting a description for a PPA"""
@@ -108,6 +112,7 @@ def test_create_with_description():
     assert(ppa is not None)
     assert(ppa.description == description)
 
+
 def test_create_with_team():
     """Check creating a PPA for a particular team"""
     lp = LpServiceMock()
@@ -117,22 +122,25 @@ def test_create_with_team():
     assert(ppa is not None)
     assert(ppa.address == 'ppa:test_team_name/ppa_test_name')
 
+
 def test_create_for_lpbug():
     """Check associating a bug # when creating a PPA"""
     ppa_group = PpaGroup(service=LpServiceMock())
     lpbug = '1234567'
-    ppa = ppa_group.create('lp'+lpbug)
+    ppa = ppa_group.create('lp' + lpbug)
     assert(ppa is not None)
     assert(lpbug in ppa.description)
 
+
 def test_create_for_merge_proposal():
     """Check associating a merge proposal when creating a PPA"""
     ppa_group = PpaGroup(service=LpServiceMock())
     version = '1.2.3-4'
-    ppa = ppa_group.create('merge.'+version)
+    ppa = ppa_group.create('merge.' + version)
     assert(ppa is not None)
     assert(version in ppa.description)
 
+
 def test_list_ppas():
     """Check listing the PPAs for a PPA group"""
     test_ppa_list = ['a', 'b', 'c', 'd']
diff --git a/tests/test_scripts_ppa.py b/tests/test_scripts_ppa.py
index dc4e411..4c37e29 100644
--- a/tests/test_scripts_ppa.py
+++ b/tests/test_scripts_ppa.py
@@ -25,14 +25,15 @@ loader = importlib.machinery.SourceFileLoader(SCRIPT_NAME, script_path)
 script = types.ModuleType(loader.name)
 loader.exec_module(script)
 
+
 @pytest.fixture
 def fake_config():
     return {
         'ppa_name': 'testing',
         'team_name': 'tester',
         'wait_seconds': 0.1
-        }
-    return script.create_config(args)
+    }
+
 
 @pytest.fixture
 def fake_source_package():
@@ -41,10 +42,11 @@ def fake_source_package():
         'name': 'test-source',
         'version': '1.0-2ubuntu3',
         'binaries': [
-            { 'name': 'foo', }
-            { 'name': 'bar', }
-            ]
-        }
+            {'name': 'foo'},
+            {'name': 'bar'}
+        ]
+    }
+
 
 @pytest.fixture
 def fake_binary_package():
@@ -52,7 +54,8 @@ def fake_binary_package():
     return {
         'name': 'test-binary',
         'source': 'test-source',
-        }
+    }
+
 
 @pytest.fixture
 def fake_build():
@@ -60,7 +63,8 @@ def fake_build():
     return {
         'binary': 'foo',
         'status': 'Failed',
-        }
+    }
+
 
 @pytest.fixture
 def fake_bug_report():
@@ -69,10 +73,11 @@ def fake_bug_report():
         'id': 1234,
         'title': 'foobar',
         'desc': 'baz',
-        }
+    }
+
 
 def test_create_parser():
-    parser = script.create_parser()
+    # parser = script.create_parser()
 
     # TODO: Don't I have an existing example arg-parse test somewhere?
     # TODO: Check command is recognized
@@ -85,74 +90,87 @@ def test_create_parser():
 
     pass
 
+
 @pytest.mark.xfail(reason="Unimplemented")
 def test_create_config():
-    args = []
+    # args = []
     # TODO: Set config_filename, ppa_name, team_name in args
-    config = script.create_config(args)
+    # config = script.create_config(args)
 
     pass
 
+
 # TODO: Monkeypatch in Lp = MockLp
 @pytest.mark.xfail(reason="Unimplemented")
 def test_get_ppa():
     # TODO: In fake_config, set ppa_name, team_name, and lp
-    ppa = script.get_ppa(fake_config)
+    # ppa = script.get_ppa(fake_config)
     # TODO: Verify type(ppa) is Ppa
     # TODO: Verify that ppa_name is set properly in ppa
     # TODO: Verify that team_name is set properly in ppa
     # TODO: Verify that lp is set properly in ppa
+    pass
+
 
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_create(fake_config):
-    assert command_create(fake_config) == 0
+    assert script.command_create(fake_config) == 0
 
     # TODO: Specify a ppa_name and verify it gets used properly
     # TODO: Specify a team name
     # TODO: Verify if no team name specified, the lp_user is used
     #   instead
     # TODO: Verify the ppa_address is set as expected
+    pass
+
 
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_desc(fake_config):
-    assert command_desc(fake_config) == 0
+    assert script.command_desc(fake_config) == 0
     # TODO: Assert that if --dry-run specified, there are no actual
     #   changes requested of launchpad
     # TODO: Verify the description gets set as expected
 
+
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_destroy(fake_config):
     # TODO: Create a fake ppa to be destroyed
-    assert command_destroy(fake_config) == 0
+    assert script.command_destroy(fake_config) == 0
     # TODO: Verify the ppa is requested to be deleted
 
+
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_list(fake_config):
     # TODO: Create a fake ppa with contents to be listed
-    assert command_list(fake_config) == 0
+    assert script.command_list(fake_config) == 0
     # TODO: Verify the ppa addresses get listed
 
+
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_exists(fake_config):
     # TODO: Create fake ppa that exists
-    assert command_exists(fake_config) == 0
+    assert script.command_exists(fake_config) == 0
     # TODO: Verify this returns true when the ppa does exist
 
+
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_not_exists(fake_config):
     # TODO: Verify this returns true when the ppa does not exist
-    assert command_exists(fake_config) == 1
+    assert script.command_exists(fake_config) == 1
+
 
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_show(fake_config):
-    assert command_show(fake_config) == 0
+    assert script.command_show(fake_config) == 0
+
 
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_status(fake_config):
-    assert command_status(fake_config) == 0
+    assert script.command_status(fake_config) == 0
     # TODO: Capture stdout and compare with expected
 
+
 @pytest.mark.xfail(reason="Unimplemented")
 def test_command_wait(fake_config):
     # TODO: Set wait period to 1 sec
-    assert command_wait(fake_config) == 0
+    assert script.command_wait(fake_config) == 0
diff --git a/tests/test_version.py b/tests/test_version.py
index 0a1c397..fa6066f 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -11,9 +11,7 @@
 import os
 import sys
 sys.path.insert(0, os.path.realpath(
-        os.path.join(os.path.dirname(__file__), "..")))
-
-import pytest
+    os.path.join(os.path.dirname(__file__), "..")))
 
 from ppa._version import __version__, __version_info__
 
@@ -24,6 +22,7 @@ def test_version():
     assert(__version__[0].isdigit())
     assert(__version__[-1] != '.')
 
+
 def test_version_info():
     assert(type(__version_info__) is tuple)
     assert(len(__version_info__) > 1)