Merging upstream version 1.24.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 4 insertions, 15 deletions

diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
index 3cff2cc..c7db06c 100644
--- a/mycli/packages/completion_engine.py
+++ b/mycli/packages/completion_engine.py
@@ -1,5 +1,3 @@
-import os
-import sys
 import sqlparse
 from sqlparse.sql import Comparison, Identifier, Where
 from .parseutils import last_word, extract_tables, find_prev_keyword
diff --git a/mycli/packages/parseutils.py b/mycli/packages/parseutils.py
index 268e04e..fa5f2c9 100644
--- a/mycli/packages/parseutils.py
+++ b/mycli/packages/parseutils.py
@@ -12,7 +12,8 @@ cleanup_regex = {
         'most_punctuations': re.compile(r'([^\.():,\s]+)$'),
         # This matches everything except a space.
         'all_punctuations': re.compile(r'([^\s]+)$'),
-        }
+}
+
 
 def last_word(text, include='alphanum_underscore'):
     r"""
@@ -226,14 +227,6 @@ def is_destructive(queries):
     return False
 
 
-def is_open_quote(sql):
-    """Returns true if the query contains an unclosed quote."""
-
-    # parsed can contain one or more semi-colon separated commands
-    parsed = sqlparse.parse(sql)
-    return any(_parsed_is_open_quote(p) for p in parsed)
-
-
 if __name__ == '__main__':
     sql = 'select * from (select t. from tabl t'
     print (extract_tables(sql))
@@ -263,5 +256,4 @@ def is_dropping_database(queries, dbname):
             )
             if database_token is not None and normalize_db_name(database_token.get_name()) == dbname:
                 result = keywords[0].normalized == "DROP"
-    else:
-        return result
+    return result
diff --git a/mycli/packages/special/iocommands.py b/mycli/packages/special/iocommands.py
index 58066b8..01f3c7b 100644
--- a/mycli/packages/special/iocommands.py
+++ b/mycli/packages/special/iocommands.py
@@ -302,7 +302,7 @@ def execute_system_command(arg, **_):
     usage = "Syntax: system [command].\n"
 
     if not arg:
-      return [(None, None, None, usage)]
+        return [(None, None, None, usage)]
 
     try:
         command = arg.strip()
diff --git a/mycli/packages/tabular_output/sql_format.py b/mycli/packages/tabular_output/sql_format.py
index 730e633..e6587bd 100644
--- a/mycli/packages/tabular_output/sql_format.py
+++ b/mycli/packages/tabular_output/sql_format.py
@@ -1,6 +1,5 @@
 """Format adapter for sql."""
 
-from cli_helpers.utils import filter_dict_by_key
 from mycli.packages.parseutils import extract_tables
 
 supported_formats = ('sql-insert', 'sql-update', 'sql-update-1',