SNOW-159814 fix new flake8 3.8.0 issues

Description New flake8 version is able to find new coding issues, fixing these. Testing Jenkins tests have passed and Travis should run these as well.
snowflakedb · May 12, 2020 · 153589d · 153589d
1 parent 0356e73
commit 153589d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/pandas_tools.py b/pandas_tools.py
@@ -94,7 +94,7 @@ def write_pandas(conn: 'SnowflakeConnection',
  '"{stage_name}"'.format(stage_name=stage_name), _is_internal=True).fetchall()
  break
  except ProgrammingError as pe:
- if pe.msg.endswith('already exists.'.format(stage_name)):
+ if pe.msg.endswith('already exists.'):
  continue
  raise
 

diff --git a/test/sso/test_unit_sso_connection.py b/test/sso/test_unit_sso_connection.py
@@ -9,11 +9,9 @@
 from snowflake.connector.auth import delete_temporary_credential
 from snowflake.connector.compat import IS_MACOS
 
-@patch(
- 'snowflake.connector.auth_webbrowser.AuthByWebBrowser.authenticate')
-@patch(
- 'snowflake.connector.network.SnowflakeRestful._post_request'
-)
+
+@patch('snowflake.connector.auth_webbrowser.AuthByWebBrowser.authenticate')
+@patch('snowflake.connector.network.SnowflakeRestful._post_request')
 def test_connect_externalbrowser(
  mockSnowflakeRestfulPostRequest,
  mockAuthByBrowserAuthenticate):

diff --git a/test/test_boolean.py b/test/test_boolean.py
@@ -30,7 +30,7 @@ def test_binding_fetching_boolean(conn_cnx, db_parameters):
  # SNOW-15905: boolean support
  results = cnx.cursor().execute("""
 SELECT CASE WHEN (null LIKE trim(null)) THEN null ELSE null END
-""".format(name=db_parameters['name'])).fetchall()
+""").fetchall()
  assert not results[0][0]
 
  finally:

diff --git a/test/test_load_unload.py b/test/test_load_unload.py
@@ -164,7 +164,6 @@ def test_put_local_file(conn_cnx, test_data):
 AWS_SECRET_KEY={aws_secret_access_key}))
 """.format(aws_access_key_id=test_data.AWS_ACCESS_KEY_ID,
  aws_secret_access_key=test_data.AWS_SECRET_ACCESS_KEY,
- database=test_data.database_name,
  stage_name=test_data.stage_name, ))
  cur.execute("""
 put file://{}/ExecPlatform/Database/data/orders_10*.csv @%pytest_putget_t1

diff --git a/test/test_put_get_medium.py b/test/test_put_get_medium.py
@@ -579,7 +579,7 @@ def _generate_huge_value_json(tmpdir, n=1, value_size=1):
  f = gzip.open(fname, 'wb')
  for i in range(n):
  logger.debug("adding a value in {}".format(i))
- f.write('{"k":"{0}"}'.format(
+ f.write('{{"k":"{}"}}'.format(
  ''.join(
  random.choice(string.ascii_uppercase + string.digits) for _ in
  range(value_size))))

diff --git a/test/test_put_get_user_stage.py b/test/test_put_get_user_stage.py
@@ -371,7 +371,7 @@ def _put_list_rm_files_in_stage(tmpdir, conn_cnx, db_parameters, elem):
  assert rec[6] == 'UPLOADED'
  rec = cnx.cursor().execute("""
 LIST @{stage_name}
- """.format(stage_name=stage_name, output_dir=output_dir)).fetchone()
+ """.format(stage_name=stage_name)).fetchone()
  assert rec, 'LIST should return something'
  assert rec[0].startswith('s3://'), "The file location in S3"
  rec = cnx.cursor().execute("""

diff --git a/test/test_transaction.py b/test/test_transaction.py
@@ -108,7 +108,7 @@ def fin():
  assert ret[0] == 21
  cnx.cursor().execute("""
 SELECT WRONG SYNTAX QUERY
-""".format(name=db_parameters['name']))
+""")
  raise Exception("Failed to cause the syntax error")
  except snowflake.connector.Error:
  # syntax error should be caught here