Some code style updates

Author: mikicz

django_pgviews/management/commands/clear_pgviews.py

@@ -1,12 +1,11 @@
 import logging
 
-from django.core.management.base import BaseCommand
 from django.apps import apps
+from django.core.management.base import BaseCommand
 from django.db import connection
 
 from django_pgviews.view import clear_view, View, MaterializedView
 
-
 log = logging.getLogger("django_pgviews.sync_pgviews")
 
 
@@ -27,7 +26,4 @@ def handle(self, **options):
                 msg = "dropped"
             else:
                 msg = "not dropped"
-            log.info(
-                "%(python_name)s (%(view_name)s): %(msg)s"
-                % {"python_name": python_name, "view_name": view_cls._meta.db_table, "msg": msg}
-            )
+            log.info("%s (%s): %s", python_name, view_cls._meta.db_table, msg)

django_pgviews/management/commands/sync_pgviews.py

@@ -1,13 +1,9 @@
-from optparse import make_option
 import logging
 
 from django.core.management.base import BaseCommand
-from django.db import connection
-from django.apps import apps
 
 from django_pgviews.models import ViewSyncer
 
-
 log = logging.getLogger("django_pgviews.sync_pgviews")
 
 

django_pgviews/models.py

@@ -3,8 +3,8 @@
 from django.apps import apps
 from django.db import connection
 
-from django_pgviews.view import create_view, View, MaterializedView
 from django_pgviews.signals import view_synced, all_views_synced
+from django_pgviews.view import create_view, View, MaterializedView
 
 log = logging.getLogger("django_pgviews.sync_pgviews")
 
@@ -23,7 +23,7 @@ def run(self, force, update, **options):
             backlog = self.run_backlog(backlog, force, update)
 
         if loop >= 10:
-            log.warn("pgviews dependencies hit limit. Check if your model dependencies are correct")
+            log.warning("pgviews dependencies hit limit. Check if your model dependencies are correct")
         else:
             all_views_synced.send(sender=None)
 
@@ -80,5 +80,8 @@ def run_backlog(self, models, force, update):
                     msg = "forced overwrite of existing schema"
                 elif status == "FORCE_REQUIRED":
                     msg = "exists with incompatible schema, " "--force required to update"
-                log.info("pgview %(python_name)s %(msg)s" % {"python_name": name, "msg": msg})
+                else:
+                    msg = status
+
+                log.info("pgview %s %s", name, msg)
         return backlog

django_pgviews/view.py

@@ -7,15 +7,14 @@
 
 import django
 import psycopg2
+from django.apps import apps
 from django.core import exceptions
 from django.db import connection, transaction
-from django.db.models.query import QuerySet
 from django.db import models
-from django.apps import apps
+from django.db.models.query import QuerySet
 
 from django_pgviews.db import get_fields_by_name
 
-
 FIELD_SPEC_REGEX = r"^([A-Za-z_][A-Za-z0-9_]*)\." r"([A-Za-z_][A-Za-z0-9_]*)\." r"(\*|(?:[A-Za-z_][A-Za-z0-9_]*))$"
 FIELD_SPEC_RE = re.compile(FIELD_SPEC_REGEX)
 

tests/test_project/test_project/urls.py

@@ -1,7 +1 @@
-from django.conf.urls import include, url
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
 urlpatterns = []

tests/test_project/test_project/viewtest/models.py

@@ -20,12 +20,7 @@ class SimpleUser(view.View):
     # The row_number() window function is needed so that Django sees some kind
     # of 'id' field. We could also grab the one from `auth.User`, but this
     # seemed like more fun :)
-    sql = """
-    SELECT
-        username,
-        password,
-        row_number() OVER () AS id
-    FROM auth_user;"""
+    sql = """SELECT username, password, row_number() OVER () AS id FROM auth_user;"""
 
 
 class RelatedView(view.ReadOnlyView):

tests/test_project/test_project/viewtest/tests.py

@@ -28,26 +28,17 @@ def test_views_have_been_created(self):
         """Look at the PG View table to ensure views were created.
         """
         with closing(connection.cursor()) as cur:
-            cur.execute(
-                """SELECT COUNT(*) FROM pg_views
-                        WHERE viewname LIKE 'viewtest_%';"""
-            )
+            cur.execute("""SELECT COUNT(*) FROM pg_views WHERE viewname LIKE 'viewtest_%';""")
 
             (count,) = cur.fetchone()
             self.assertEqual(count, 4)
 
-            cur.execute(
-                """SELECT COUNT(*) FROM pg_matviews
-                        WHERE matviewname LIKE 'viewtest_%';"""
-            )
+            cur.execute("""SELECT COUNT(*) FROM pg_matviews WHERE matviewname LIKE 'viewtest_%';""")
 
             (count,) = cur.fetchone()
             self.assertEqual(count, 3)
 
-            cur.execute(
-                """SELECT COUNT(*) FROM information_schema.views
-                        WHERE table_schema = 'test_schema';"""
-            )
+            cur.execute("""SELECT COUNT(*) FROM information_schema.views WHERE table_schema = 'test_schema';""")
 
             (count,) = cur.fetchone()
             self.assertEqual(count, 1)
@@ -57,18 +48,12 @@ def test_clear_views(self):
         """
         call_command("clear_pgviews", *[], **{})
         with closing(connection.cursor()) as cur:
-            cur.execute(
-                """SELECT COUNT(*) FROM pg_views
-                        WHERE viewname LIKE 'viewtest_%';"""
-            )
+            cur.execute("""SELECT COUNT(*) FROM pg_views WHERE viewname LIKE 'viewtest_%';""")
 
             (count,) = cur.fetchone()
             self.assertEqual(count, 0)
 
-            cur.execute(
-                """SELECT COUNT(*) FROM information_schema.views
-                        WHERE table_schema = 'test_schema';"""
-            )
+            cur.execute("""SELECT COUNT(*) FROM information_schema.views WHERE table_schema = 'test_schema';""")
 
             (count,) = cur.fetchone()
             self.assertEqual(count, 0)
@@ -173,26 +158,17 @@ def test_sync_depending_views(self):
         with closing(connection.cursor()) as cur:
             cur.execute("DROP VIEW viewtest_relatedview CASCADE;")
 
-            cur.execute(
-                """CREATE VIEW viewtest_relatedview as
-                SELECT id AS model_id, name FROM viewtest_testmodel;"""
-            )
+            cur.execute("""CREATE VIEW viewtest_relatedview as SELECT id AS model_id, name FROM viewtest_testmodel;""")
 
-            cur.execute(
-                """CREATE VIEW viewtest_dependantview as
-                        SELECT name from viewtest_relatedview;"""
-            )
+            cur.execute("""CREATE VIEW viewtest_dependantview as SELECT name from viewtest_relatedview;""")
 
             cur.execute("""SELECT name from viewtest_relatedview;""")
             cur.execute("""SELECT name from viewtest_dependantview;""")
 
         call_command("sync_pgviews", "--force")
 
         with closing(connection.cursor()) as cur:
-            cur.execute(
-                """SELECT COUNT(*) FROM pg_views
-                        WHERE viewname LIKE 'viewtest_%';"""
-            )
+            cur.execute("""SELECT COUNT(*) FROM pg_views WHERE viewname LIKE 'viewtest_%';""")
 
             (count,) = cur.fetchone()
             self.assertEqual(count, 4)
@@ -236,14 +212,8 @@ def test_sync_depending_materialized_views(self):
             self.assertEqual(count, 4)
 
             with self.assertRaises(Exception):
-                cur.execute(
-                    """SELECT name from
-                    viewtest_dependantmaterializedview;"""
-                )
+                cur.execute("""SELECT name from viewtest_dependantmaterializedview;""")
                 cur.execute("""SELECT name from viewtest_materializedrelatedview; """)
 
             with self.assertRaises(Exception):
-                cur.execute(
-                    """SELECT name from
-                    viewtest_dependantmaterializedview;"""
-                )
+                cur.execute("""SELECT name from viewtest_dependantmaterializedview;""")

tests/test_project/test_project/viewtest/views.py

@@ -1,33 +1,7 @@
-"""
-WSGI config for test_project project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
 import os
 
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-# os.environ["DJANGO_SETTINGS_MODULE"] = "test_project.settings"
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_project.settings")
 
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
 from django.core.wsgi import get_wsgi_application
 
 application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)