More linting

panoramix/__init__.py

@@ -4,7 +4,6 @@
 from flask.ext.appbuilder import SQLA, AppBuilder, IndexView
 from flask.ext.appbuilder.baseviews import expose
 from flask.ext.migrate import Migrate
-from panoramix import config, views
 
 
 APP_DIR = os.path.dirname(__file__)
@@ -34,3 +33,4 @@ def index(self):
 sm = appbuilder.sm
 
 get_session = appbuilder.get_session
+from panoramix import config, views

panoramix/config.py

@@ -1,16 +1,16 @@
+"""
+All configuration in this file can be overridden by providing a local_config
+in your PYTHONPATH.
+
+There' a ``from local_config import *`` at the end of this file.
+"""
 import os
 from flask_appbuilder.security.manager import AUTH_DB
 # from flask_appbuilder.security.manager import (
 #    AUTH_OID, AUTH_REMOTE_USER, AUTH_DB, AUTH_LDAP, AUTH_OAUTH)
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 from dateutil import tz
 
-"""
-All configuration in this file can be overridden by providing a local_config
-in your PYTHONPATH.
-
-There' a ``from local_config import *`` at the end of this file.
-"""
 
 # ---------------------------------------------------------
 # Panoramix specifix config
@@ -133,5 +133,5 @@
 
 try:
     from panoramix_config import *
-except:
+except Exception:
     pass

panoramix/migrations/versions/1e2841a4128_.py

@@ -12,15 +12,10 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 def upgrade():
-    ### commands auto generated by Alembic - please adjust! ###
     op.add_column('table_columns', sa.Column('expression', sa.Text(), nullable=True))
-    ### end Alembic commands ###
 
 
 def downgrade():
-    ### commands auto generated by Alembic - please adjust! ###
     op.drop_column('table_columns', 'expression')
-    ### end Alembic commands ###

panoramix/migrations/versions/2929af7925ed_tz_offsets_in_data_sources.py

@@ -12,7 +12,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 def upgrade():
     op.add_column('datasources', sa.Column('offset', sa.Integer(), nullable=True))

panoramix/migrations/versions/430039611635_log_more.py

@@ -12,7 +12,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 def upgrade():
     op.add_column('logs', sa.Column('dashboard_id', sa.Integer(), nullable=True))

panoramix/migrations/versions/43df8de3a5f4_dash_json.py

@@ -12,10 +12,11 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
+
 
 def upgrade():
     op.add_column('dashboards', sa.Column('json_metadata', sa.Text(), nullable=True))
 
+
 def downgrade():
     op.drop_column('dashboards', 'json_metadata')

panoramix/migrations/versions/5a7bad26f2a7_.py

@@ -12,7 +12,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
+
 
 def upgrade():
     op.add_column('dashboards', sa.Column('css', sa.Text(), nullable=True))

panoramix/migrations/versions/7dbf98566af7_slice_description.py

@@ -12,7 +12,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 def upgrade():
     op.add_column('slices', sa.Column('description', sa.Text(), nullable=True))

panoramix/migrations/versions/d827694c7555_css_templates.py

@@ -12,7 +12,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 
 def upgrade():

panoramix/models.py

@@ -2,10 +2,10 @@
 from collections import namedtuple
 from datetime import timedelta, datetime
 import json
+import logging
 from six import string_types
 import sqlparse
 import requests
-import textwrap
 
 from dateutil.parser import parse
 from flask import flash
@@ -134,6 +134,7 @@ def slice_url(self):
         try:
             slice_params = json.loads(self.params)
         except Exception as e:
+            logging.exception(e)
             slice_params = {}
         slice_params['slice_id'] = self.id
         slice_params['slice_name'] = self.slice_name
@@ -150,7 +151,8 @@ def edit_url(self):
     @property
     def slice_link(self):
         url = self.slice_url
-        return '<a href="{url}">{self.slice_name}</a>'.format(**locals())
+        return '<a href="{url}">{self.slice_name}</a>'.format(
+            url=url, self=self)
 
     @property
     def js_files(self):
@@ -350,7 +352,8 @@ def name(self):
     @property
     def table_link(self):
         url = "/panoramix/explore/{self.type}/{self.id}/".format(self=self)
-        return '<a href="{url}">{self.table_name}</a>'.format(**locals())
+        return '<a href="{url}">{self.table_name}</a>'.format(
+            url=url, self=self)
 
     @property
     def metrics_combo(self):
@@ -732,7 +735,8 @@ def __repr__(self):
     @property
     def datasource_link(self):
         url = "/panoramix/explore/{self.type}/{self.id}/".format(self=self)
-        return '<a href="{url}">{self.datasource_name}</a>'.format(**locals())
+        return '<a href="{url}">{self.datasource_name}</a>'.format(
+            url=url, self=self)
 
     def get_metric_obj(self, metric_name):
         return [

panoramix/utils.py

@@ -44,6 +44,7 @@ def parse_human_datetime(s):
     Use the parsedatetime lib to return ``datetime.datetime`` from human
     generated strings
 
+    >>> from datetime import date, timedelta
     >>> parse_human_datetime('2015-04-03')
     datetime.datetime(2015, 4, 3, 0, 0)
     >>> parse_human_datetime('2/3/1969')

panoramix/views.py

@@ -167,6 +167,7 @@ def post_add(self, table):
         try:
             table.fetch_metadata()
         except Exception as e:
+            logging.exception(e)
             flash(
             "Table [{}] doesn't seem to exist, "
             "couldn't fetch metadata".format(table.table_name),
@@ -215,7 +216,11 @@ class SliceModelView(PanoramixModelView, DeleteMixin):
         'table', 'dashboards', 'params']
     base_order = ('changed_on','desc')
     description_columns = {
-        'description': Markup("The content here can be displayed as widget headers in the dashboard view. Supports <a href='https://daringfireball.net/projects/markdown/'>markdown</a>"),
+        'description': Markup(
+            "The content here can be displayed as widget headers in the "
+            "dashboard view. Supports "
+            "<a href='https://daringfireball.net/projects/markdown/'>"
+            "markdown</a>"),
     }
 
 
@@ -528,7 +533,7 @@ def testconn(self):
             engine = create_engine(uri)
             engine.connect()
             return json.dumps(engine.table_names(), indent=4)
-        except Exception as e:
+        except Exception:
             return Response(
                 traceback.format_exc(),
                 status=500,
@@ -607,7 +612,7 @@ def select_star(self, database_id, table_name):
         t = mydb.get_table(table_name)
         fields = ", ".join(
             [c.name for c in t.columns] or "*")
-        s = "SELECT\n{fields}\nFROM {table_name}".format(**locals())
+        s = "SELECT\n{}\nFROM {}".format(fields, table_name)
         return self.render_template(
             "panoramix/ajah.html",
             content=s