Added flake8 test and updated affected code

Author: joshthoward

.github/workflows/ci.yml

@@ -29,3 +29,6 @@ jobs:
  - name: Run tests
  run: |
  pytest -s tests/ integration_tests/
+ - name: Run linter
+ run: |
+ flake8

integration_tests/fixtures.py renamed to integration_tests/conftest.py

@@ -34,14 +34,6 @@
 TRINO_PORT = 8080
 
 
-def is_process_alive(pid):
- try:
- os.kill(pid, 0)
- except ProcessLookupError:
- return False
- return True
-
-
 def get_local_port():
  with closing(socket.socket()) as s:
  s.bind(("localhost", 0))

integration_tests/test_dbapi.py

@@ -11,11 +11,9 @@
 # limitations under the License.
 from __future__ import absolute_import, division, print_function
 from datetime import datetime
-import uuid
 import math
 
-import fixtures
-from fixtures import run_trino
+from conftest import TRINO_VERSION
 import pytest
 import pytz
 
@@ -53,7 +51,7 @@ def test_select_query(trino_connection):
  rows = cur.fetchall()
  assert len(rows) > 0
  row = rows[0]
- assert row[2] == fixtures.TRINO_VERSION
+ assert row[2] == TRINO_VERSION
  columns = dict([desc[:2] for desc in cur.description])
  assert columns["node_id"] == "varchar"
  assert columns["http_uri"] == "varchar"
@@ -97,7 +95,7 @@ def test_none_query_param(trino_connection):
  cur.execute("SELECT ?", params=(None,))
  rows = cur.fetchall()
 
- assert rows[0][0] == None
+ assert rows[0][0] is None
 
 
 def test_string_query_param(trino_connection):
@@ -112,18 +110,13 @@ def test_string_query_param(trino_connection):
 def test_datetime_query_param(trino_connection):
  cur = trino_connection.cursor()
 
- cur.execute(
- "SELECT ?", 
- params=(datetime(2020, 1, 1, 0, 0, 0),)
- )
+ cur.execute("SELECT ?", params=(datetime(2020, 1, 1, 0, 0, 0),))
  rows = cur.fetchall()
 
  assert rows[0][0] == "2020-01-01 00:00:00.000"
 
- cur.execute(
- "SELECT ?", 
- params=(datetime(2020, 1, 1, 0, 0, 0, tzinfo=pytz.utc),)
- )
+ cur.execute("SELECT ?",
+ params=(datetime(2020, 1, 1, 0, 0, 0, tzinfo=pytz.utc),))
  rows = cur.fetchall()
 
  assert rows[0][0] == "2020-01-01 00:00:00.000 UTC"
@@ -138,12 +131,10 @@ def test_array_query_param(trino_connection):
 
  assert rows[0][0] == [1, 2, 3]
 
- cur.execute(
- "SELECT ?", 
- params=([[1, 2, 3],[4,5,6]],))
+ cur.execute("SELECT ?", params=([[1, 2, 3], [4, 5, 6]],))
  rows = cur.fetchall()
 
- assert rows[0][0] == [[1, 2, 3],[4,5,6]]
+ assert rows[0][0] == [[1, 2, 3], [4, 5, 6]]
 
  cur.execute("SELECT TYPEOF(?)", params=([1, 2, 3],))
  rows = cur.fetchall()
@@ -171,12 +162,12 @@ def test_boolean_query_param(trino_connection):
  cur.execute("SELECT ?", params=(True,))
  rows = cur.fetchall()
 
- assert rows[0][0] == True
+ assert rows[0][0] is True
 
  cur.execute("SELECT ?", params=(False,))
  rows = cur.fetchall()
 
- assert rows[0][0] == False
+ assert rows[0][0] is False
 
 
 def test_float_query_param(trino_connection):
@@ -201,6 +192,7 @@ def test_float_nan_query_param(trino_connection):
 
 @pytest.mark.skip(reason="Nan currently not returning the correct python type fon inf")
 def test_float_inf_query_param(trino_connection):
+ cur = trino_connection.cursor()
  cur.execute("SELECT ?", params=(float("inf"),))
  rows = cur.fetchall()
 
@@ -368,15 +360,15 @@ def test_transaction_multiple(trino_connection_with_transaction):
  assert len(rows1) == 1000
  assert len(rows2) == 1000
 
+
 def test_invalid_query_throws_correct_error(trino_connection):
- """
- tests that an invalid query raises the correct exception
+ """Tests that an invalid query raises the correct exception
  """
  cur = trino_connection.cursor()
  with pytest.raises(TrinoQueryError):
  cur.execute(
  """
- select * FRMO foo WHERE x = ?; 
+ select * FRMO foo WHERE x = ?;
  """,
  params=(3,),
  )

setup.cfg

@@ -1,2 +1,11 @@
 [aliases]
 test=pytest
+
+[flake8]
+max-line-length = 120
+# W503 raises a warning when there is a line break before a binary operator.
+# This is best practice according to PEP 8 and the rule should be ignored. 
+#
+# https://www.flake8rules.com/rules/W503.html
+# https://www.python.org/dev/peps/pep-0008/#should-a-line-break-before-or-after-a-binary-operator
+ignore = W503

setup.py

@@ -31,7 +31,7 @@
 
 all_require = [kerberos_require]
 
-tests_require = all_require + ["httpretty", "pytest", "pytest-runner", "mock", "pytz"]
+tests_require = all_require + ["httpretty", "pytest", "pytest-runner", "mock", "pytz", "flake8"]
 
 py27_require = ["ipaddress", "typing"]
 

tests/test_client.py

@@ -16,7 +16,6 @@
 import httpretty
 import pytest
 import requests
-import socket
 import time
 
 try:
@@ -26,7 +25,7 @@
  import mock
 
 from requests_kerberos.exceptions import KerberosExchangeError
-from trino.client import PROXIES, TrinoQuery, TrinoRequest, TrinoResult
+from trino.client import TrinoQuery, TrinoRequest, TrinoResult
 from trino.auth import KerberosAuthentication
 from trino import constants
 import trino.exceptions
@@ -143,7 +142,7 @@
  },
  ],
  "taskDownloadUris": [],
- "partialCancelUri": "http://localhost:8080/v1/stage/20161116_195728_00000_xtnym.0", # NOQA
+ "partialCancelUri": "http://localhost:8080/v1/stage/20161116_195728_00000_xtnym.0", # NOQA: E501
  "stats": {
  "nodes": 2,
  "processedBytes": 880,
@@ -192,7 +191,7 @@
  "queuedSplits": 0,
  "wallTimeMillis": 36,
  },
- "infoUri": "http://coordinator:8080/query.html?20161116_195728_00000_xtnym", # NOQA
+ "infoUri": "http://coordinator:8080/query.html?20161116_195728_00000_xtnym", # NOQA: E501
 }
 
 RESP_ERROR_GET_0 = {
@@ -214,8 +213,8 @@
  "com.facebook.presto.sql.tree.Table.accept(Table.java:50)",
  "com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)",
  "com.facebook.presto.sql.analyzer.StatementAnalyzer.analyzeFrom(StatementAnalyzer.java:1413)",
- "com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuerySpecification(StatementAnalyzer.java:670)",
- "com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuerySpecification(StatementAnalyzer.java:166)",
+ "com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuerySpecification(StatementAnalyzer.java:670)", # NOQA: E501
+ "com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuerySpecification(StatementAnalyzer.java:166)", # NOQA: E501
  "com.facebook.presto.sql.tree.QuerySpecification.accept(QuerySpecification.java:125)",
  "com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)",
  "com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuery(StatementAnalyzer.java:438)",
@@ -672,4 +671,3 @@ def json(self):
 
  # Validate the result is an instance of TrinoResult
  assert isinstance(result, TrinoResult)
-

trino/__init__.py

@@ -20,4 +20,6 @@
 from . import exceptions
 from . import logging
 
+__all__ = ['auth', 'dbapi', 'client', 'constants', 'exceptions', 'logging']
+
 __version__ = "0.305.0"

trino/dbapi.py

@@ -23,16 +23,9 @@
 
 from typing import Any, List, Optional # NOQA for mypy types
 
-try:
- from urllib.parse import urlencode
-except ImportError:
- # Python 2
- from urllib import urlencode
-
 import copy
 import uuid
 import datetime
-import re
 import math
 
 from trino import constants
@@ -283,7 +276,6 @@ def _prepare_statement(self, operation, statement_name):
 
  raise trino.exceptions.FailedToObtainAddedPrepareHeader
 
-
  def _get_added_prepare_statement_trino_query(
  self,
  statement_name,
@@ -347,7 +339,6 @@ def _format_prepared_param(self, param):
 
  raise trino.exceptions.NotSupportedError("Query parameter of type '%s' is not supported." % type(param))
 
-
  def _deallocate_prepare_statement(self, added_prepare_header, statement_name):
  sql = 'DEALLOCATE PREPARE ' + statement_name