Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master

[Haw Loeung]

Reformatted by black

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Barry Price (barryprice)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 98223eb762ed80bfa0d3b49071ec0dec015587f3

diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index 0beb6b6..68462fb 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -2,9 +2,10 @@ import datetime
 import grp
 import os
 import pwd
-import yaml
 from copy import deepcopy
 
+import yaml
+
 from charms import reactive
 from charms.layer import status
 from charmhelpers import context
@@ -414,13 +415,15 @@ def sites_from_config(sites_yaml, sites_secrets=None, blacklist_ports=None):
     cache_port = 0
     backend_port = 0
     for site, site_conf in sites.items():
-        (cache_port, unused_backend_port) = utils.next_port_pair(cache_port, backend_port,
-                                                                 blacklist_ports=blacklist_ports)
+        (cache_port, unused_backend_port) = utils.next_port_pair(
+            cache_port, backend_port, blacklist_ports=blacklist_ports
+        )
         site_conf['cache_port'] = cache_port
         for location, loc_conf in site_conf.get('locations', {}).items():
             if loc_conf and loc_conf.get('backends'):
-                (unused_cache_port, backend_port) = utils.next_port_pair(cache_port, backend_port,
-                                                                         blacklist_ports=blacklist_ports)
+                (unused_cache_port, backend_port) = utils.next_port_pair(
+                    cache_port, backend_port, blacklist_ports=blacklist_ports
+                )
                 loc_conf['backend_port'] = backend_port
     return sites
 
diff --git a/tests/unit/test_content_cache.py b/tests/unit/test_content_cache.py
index 428e996..8182187 100644
--- a/tests/unit/test_content_cache.py
+++ b/tests/unit/test_content_cache.py
@@ -605,7 +605,7 @@ site1.local:
                 'port': 80,
                 'cache_port': 6081,
                 'locations': {'/': {'backend_port': 8081, 'backends': ['91.189.88.152:80']}},
-            },
+            }
         }
         self.assertEqual(want, content_cache.sites_from_config(config_yaml, blacklist_ports=blacklist_ports))
 
diff --git a/tests/unit/test_haproxy.py b/tests/unit/test_haproxy.py
index bebf100..4c7ade0 100644
--- a/tests/unit/test_haproxy.py
+++ b/tests/unit/test_haproxy.py
@@ -3,9 +3,9 @@ import shutil
 import sys
 import tempfile
 import unittest
-import yaml
 
 import freezegun
+import yaml
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
 from lib import haproxy as HAProxy  # NOQA: E402
@@ -38,8 +38,7 @@ class TestLibHAProxy(unittest.TestCase):
         # Site names longer than 32 characters include a partial hash of
         # the original name.
         self.assertEqual(
-            haproxy._generate_stanza_name('site1-canonical-com-canonical-com'),
-            'site1-canonical-com-cano-7ecd6aa',
+            haproxy._generate_stanza_name('site1-canonical-com-canonical-com'), 'site1-canonical-com-cano-7ecd6aa'
         )
         self.assertEqual(
             haproxy._generate_stanza_name('site1-canonical-com-canonical-com-canonical-com'),
diff --git a/tests/unit/test_nginx.py b/tests/unit/test_nginx.py
index a419a37..e66f599 100644
--- a/tests/unit/test_nginx.py
+++ b/tests/unit/test_nginx.py
@@ -3,9 +3,9 @@ import shutil
 import sys
 import tempfile
 import unittest
-import yaml
 
 import jinja2
+import yaml
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
 from lib import nginx  # NOQA: E402
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index c5d426c..ac7c417 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -34,7 +34,7 @@ class TestLibUtils(unittest.TestCase):
         # Blacklisted ports
         self.assertEqual(
             utils.next_port_pair(0, 0, blacklist_ports=[utils.BASE_CACHE_PORT, utils.BASE_BACKEND_PORT]),
-            (utils.BASE_CACHE_PORT + 1, utils.BASE_BACKEND_PORT + 1)
+            (utils.BASE_CACHE_PORT + 1, utils.BASE_BACKEND_PORT + 1),
         )
 
     def test_next_port_pair_out_of_range(self):