diff options
Diffstat (limited to 'pgcli/main.py')
| -rw-r--r-- | pgcli/main.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pgcli/main.py b/pgcli/main.py index fb3b3546..08c6c491 100644 --- a/pgcli/main.py +++ b/pgcli/main.py @@ -1,6 +1,3 @@ -from __future__ import print_function -from __future__ import unicode_literals - import warnings from pgspecial.namedqueries import NamedQueries @@ -63,8 +60,6 @@ from .config import ( get_config, ) from .key_bindings import pgcli_bindings -from .encodingutils import utf8tounicode -from .encodingutils import text_type from .packages.prompt_utils import confirm_destructive_query from .__init__ import __version__ @@ -538,7 +533,7 @@ class PGCli(object): # fails. Don't prompt if the -w flag is supplied if self.never_passwd_prompt: return False - error_msg = utf8tounicode(exc.args[0]) + error_msg = exc.args[0] if "no password supplied" in error_msg: return True if "password authentication failed" in error_msg: @@ -1365,7 +1360,7 @@ def is_select(status): def exception_formatter(e): - return click.style(utf8tounicode(str(e)), fg="red") + return click.style(str(e), fg="red") def format_output(title, cur, headers, status, settings): @@ -1381,7 +1376,7 @@ def format_output(title, cur, headers, status, settings): return settings.missingval if not isinstance(val, list): return val - return "{" + ",".join(text_type(format_array(e)) for e in val) + "}" + return "{" + ",".join(str(format_array(e)) for e in val) + "}" def format_arrays(data, headers, **_): data = list(data) @@ -1411,7 +1406,7 @@ def format_output(title, cur, headers, status, settings): output.append(title) if cur: - headers = [case_function(utf8tounicode(x)) for x in headers] + headers = [case_function(x) for x in headers] if max_width is not None: cur = list(cur) column_types = None @@ -1429,10 +1424,10 @@ def format_output(title, cur, headers, status, settings): ): column_types.append(int) else: - column_types.append(text_type) + column_types.append(str) formatted = formatter.format_output(cur, headers, **output_kwargs) - if isinstance(formatted, (text_type)): + if isinstance(formatted, str): formatted = iter(formatted.splitlines()) first_line = next(formatted) formatted = itertools.chain([first_line], formatted) @@ -1440,7 +1435,7 @@ def format_output(title, cur, headers, status, settings): formatted = formatter.format_output( cur, headers, format_name="vertical", column_types=None, **output_kwargs ) - if isinstance(formatted, (text_type)): + if isinstance(formatted, str): formatted = iter(formatted.splitlines()) output = itertools.chain(output, formatted) |