7 files changed, 1 insertions, 22 deletions
diff --git a/pgcli/packages/parseutils/ctes.py b/pgcli/packages/parseutils/ctes.py
index 4b8786dc..75e4e40f 100644
--- a/pgcli/packages/parseutils/ctes.py
+++ b/pgcli/packages/parseutils/ctes.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from sqlparse import parse
 from sqlparse.tokens import Keyword, CTE, DML
 from sqlparse.sql import Identifier, IdentifierList, Parenthesis
diff --git a/pgcli/packages/parseutils/meta.py b/pgcli/packages/parseutils/meta.py
index a892b880..108c01a3 100644
--- a/pgcli/packages/parseutils/meta.py
+++ b/pgcli/packages/parseutils/meta.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from collections import namedtuple
 
 _ColumnMetadata = namedtuple(
diff --git a/pgcli/packages/parseutils/tables.py b/pgcli/packages/parseutils/tables.py
index ac4c1b9d..55b65b00 100644
--- a/pgcli/packages/parseutils/tables.py
+++ b/pgcli/packages/parseutils/tables.py
@@ -1,5 +1,3 @@
-from __future__ import print_function, unicode_literals
-
 import sqlparse
 from collections import namedtuple
 from sqlparse.sql import IdentifierList, Identifier, Function
diff --git a/pgcli/packages/parseutils/utils.py b/pgcli/packages/parseutils/utils.py
index 1d6c45b8..594cabfd 100644
--- a/pgcli/packages/parseutils/utils.py
+++ b/pgcli/packages/parseutils/utils.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import re
 import sqlparse
 from sqlparse.sql import Identifier
diff --git a/pgcli/packages/prioritization.py b/pgcli/packages/prioritization.py
index b692b75a..e92dcbb6 100644
--- a/pgcli/packages/prioritization.py
+++ b/pgcli/packages/prioritization.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 import sqlparse
 from sqlparse.tokens import Name
diff --git a/pgcli/packages/prompt_utils.py b/pgcli/packages/prompt_utils.py
index 63b5e059..3c584908 100644
--- a/pgcli/packages/prompt_utils.py
+++ b/pgcli/packages/prompt_utils.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import sys
 import click
 from .parseutils import is_destructive
diff --git a/pgcli/packages/sqlcompletion.py b/pgcli/packages/sqlcompletion.py
index 2828b175..93736e34 100644
--- a/pgcli/packages/sqlcompletion.py
+++ b/pgcli/packages/sqlcompletion.py
@@ -1,5 +1,3 @@
-from __future__ import print_function, unicode_literals
-
 import sys
 import re
 import sqlparse
@@ -10,14 +8,6 @@ from .parseutils.tables import extract_tables
 from .parseutils.ctes import isolate_query_ctes
 from pgspecial.main import parse_special_command
 
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    string_types = str
-else:
-    string_types = basestring
-
 
 Special = namedtuple("Special", [])
 Database = namedtuple("Database", [])
@@ -301,7 +291,7 @@ def suggest_special(text):
 
 def suggest_based_on_last_token(token, stmt):
 
-    if isinstance(token, string_types):
+    if isinstance(token, str):
         token_v = token.lower()
     elif isinstance(token, Comparison):
         # If 'token' is a Comparison type such as