From 729279655f209a3d8081b572bf1cb4099af17d43 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Feb 2021 12:29:48 +0100 Subject: Refreshing 0002-vendorized-cli_helpers.patch. Signed-off-by: Daniel Baumann --- debian/patches/0002-vendorized-cli_helpers.patch | 143 +++++++---------------- 1 file changed, 44 insertions(+), 99 deletions(-) diff --git a/debian/patches/0002-vendorized-cli_helpers.patch b/debian/patches/0002-vendorized-cli_helpers.patch index fc0be78..77e917b 100644 --- a/debian/patches/0002-vendorized-cli_helpers.patch +++ b/debian/patches/0002-vendorized-cli_helpers.patch @@ -2,40 +2,10 @@ From: Lennart Weller Date: Fri, 8 May 2020 10:51:40 +0200 Subject: vendorized cli_helpers ---- - mycli/main.py | 6 +- - mycli/packages/cli_helpers/__init__.py | 1 + - mycli/packages/cli_helpers/compat.py | 42 ++++ - mycli/packages/cli_helpers/config.py | 270 +++++++++++++++++++++ - .../cli_helpers/tabular_output/__init__.py | 13 + - .../tabular_output/delimited_output_adapter.py | 48 ++++ - .../cli_helpers/tabular_output/output_formatter.py | 228 +++++++++++++++++ - .../cli_helpers/tabular_output/preprocessors.py | 266 ++++++++++++++++++++ - .../cli_helpers/tabular_output/tabulate_adapter.py | 98 ++++++++ - .../tabular_output/terminaltables_adapter.py | 96 ++++++++ - .../tabular_output/tsv_output_adapter.py | 16 ++ - .../tabular_output/vertical_table_adapter.py | 66 +++++ - mycli/packages/cli_helpers/utils.py | 70 ++++++ - mycli/packages/tabular_output/sql_format.py | 2 +- - 14 files changed, 1218 insertions(+), 4 deletions(-) - create mode 100644 mycli/packages/cli_helpers/__init__.py - create mode 100644 mycli/packages/cli_helpers/compat.py - create mode 100644 mycli/packages/cli_helpers/config.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/__init__.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/output_formatter.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/preprocessors.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py - create mode 100644 mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py - create mode 100644 mycli/packages/cli_helpers/utils.py - -diff --git a/mycli/main.py b/mycli/main.py -index d7a7a0b..5feae89 100755 ---- a/mycli/main.py -+++ b/mycli/main.py -@@ -12,9 +12,9 @@ from random import choice +diff -Naurp mycli.orig/mycli/main.py mycli/mycli/main.py +--- mycli.orig/mycli/main.py ++++ mycli/mycli/main.py +@@ -16,9 +16,9 @@ from random import choice from io import open from pymysql import OperationalError @@ -47,19 +17,15 @@ index d7a7a0b..5feae89 100755 +from .packages.cli_helpers.utils import strip_ansi import click import sqlparse - from mycli.packages.parseutils import is_dropping_database -diff --git a/mycli/packages/cli_helpers/__init__.py b/mycli/packages/cli_helpers/__init__.py -new file mode 100644 -index 0000000..3f262a6 ---- /dev/null -+++ b/mycli/packages/cli_helpers/__init__.py + from mycli.packages.parseutils import is_dropping_database, is_destructive +diff -Naurp mycli.orig/mycli/packages/cli_helpers/__init__.py mycli/mycli/packages/cli_helpers/__init__.py +--- mycli.orig/mycli/packages/cli_helpers/__init__.py ++++ mycli/mycli/packages/cli_helpers/__init__.py @@ -0,0 +1 @@ +__version__ = '1.2.1' -diff --git a/mycli/packages/cli_helpers/compat.py b/mycli/packages/cli_helpers/compat.py -new file mode 100644 -index 0000000..3f67c62 ---- /dev/null -+++ b/mycli/packages/cli_helpers/compat.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/compat.py mycli/mycli/packages/cli_helpers/compat.py +--- mycli.orig/mycli/packages/cli_helpers/compat.py ++++ mycli/mycli/packages/cli_helpers/compat.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +"""OS and Python compatibility support.""" @@ -103,11 +69,9 @@ index 0000000..3f67c62 + Terminal256Formatter = None + +float_types = (float, Decimal) -diff --git a/mycli/packages/cli_helpers/config.py b/mycli/packages/cli_helpers/config.py -new file mode 100644 -index 0000000..b75a8c9 ---- /dev/null -+++ b/mycli/packages/cli_helpers/config.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/config.py mycli/mycli/packages/cli_helpers/config.py +--- mycli.orig/mycli/packages/cli_helpers/config.py ++++ mycli/mycli/packages/cli_helpers/config.py @@ -0,0 +1,270 @@ +# -*- coding: utf-8 -*- +"""Read and write an application's config files.""" @@ -379,11 +343,9 @@ index 0000000..b75a8c9 +def _pathify(s): + """Convert spaces to hyphens and lowercase a string.""" + return '-'.join(s.split()).lower() -diff --git a/mycli/packages/cli_helpers/tabular_output/__init__.py b/mycli/packages/cli_helpers/tabular_output/__init__.py -new file mode 100644 -index 0000000..de2f62f ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/__init__.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/__init__.py mycli/mycli/packages/cli_helpers/tabular_output/__init__.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/__init__.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/__init__.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +"""CLI Helper's tabular output module makes it easy to format your data using @@ -398,11 +360,9 @@ index 0000000..de2f62f +from .output_formatter import format_output, TabularOutputFormatter + +__all__ = ['format_output', 'TabularOutputFormatter'] -diff --git a/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py b/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py -new file mode 100644 -index 0000000..b13d008 ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py mycli/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/delimited_output_adapter.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +"""A delimited data output adapter (e.g. CSV, TSV).""" @@ -452,11 +412,9 @@ index 0000000..b13d008 + l.reset() + writer.writerow(row) + yield l.line -diff --git a/mycli/packages/cli_helpers/tabular_output/output_formatter.py b/mycli/packages/cli_helpers/tabular_output/output_formatter.py -new file mode 100644 -index 0000000..471a2ea ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/output_formatter.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/output_formatter.py mycli/mycli/packages/cli_helpers/tabular_output/output_formatter.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/output_formatter.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/output_formatter.py @@ -0,0 +1,228 @@ +# -*- coding: utf-8 -*- +"""A generic tabular data output formatter interface.""" @@ -686,11 +644,9 @@ index 0000000..471a2ea + tsv_format, tsv_output_adapter.adapter, + tsv_output_adapter.preprocessors, + {'table_format': tsv_format, 'missing_value': '', 'max_field_width': None}) -diff --git a/mycli/packages/cli_helpers/tabular_output/preprocessors.py b/mycli/packages/cli_helpers/tabular_output/preprocessors.py -new file mode 100644 -index 0000000..37bb788 ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/preprocessors.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/preprocessors.py mycli/mycli/packages/cli_helpers/tabular_output/preprocessors.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/preprocessors.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/preprocessors.py @@ -0,0 +1,266 @@ +# -*- coding: utf-8 -*- +"""These preprocessor functions are used to process data prior to output.""" @@ -958,11 +914,9 @@ index 0000000..37bb788 + + data = ([_format_number(v, column_types[i]) for i, v in enumerate(row)] for row in data) + return data, headers -diff --git a/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py b/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py -new file mode 100644 -index 0000000..3e66594 ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py mycli/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/tabulate_adapter.py @@ -0,0 +1,98 @@ +# -*- coding: utf-8 -*- +"""Format adapter for the tabulate module.""" @@ -1062,11 +1016,9 @@ index 0000000..3e66594 + tabulate.PRESERVE_WHITESPACE = preserve_whitespace + + return iter(tabulate.tabulate(data, headers, **tkwargs).split('\n')) -diff --git a/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py b/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py -new file mode 100644 -index 0000000..270e2f4 ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py mycli/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/terminaltables_adapter.py @@ -0,0 +1,96 @@ +# -*- coding: utf-8 -*- +"""Format adapter for the terminaltables module.""" @@ -1164,11 +1116,9 @@ index 0000000..270e2f4 + t.padding_right)[:3] + for r in t.gen_table(*dimensions): + yield u''.join(r) -diff --git a/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py b/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py -new file mode 100644 -index 0000000..69714f1 ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py mycli/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/tsv_output_adapter.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +"""A tsv data output adapter""" @@ -1186,11 +1136,9 @@ index 0000000..69714f1 + """Wrap the formatting inside a function for TabularOutputFormatter.""" + for row in chain((headers,), data): + yield "\t".join((replace(r, (('\n', r'\n'), ('\t', r'\t'))) for r in row)) -diff --git a/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py b/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py -new file mode 100644 -index 0000000..4a44521 ---- /dev/null -+++ b/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py mycli/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py +--- mycli.orig/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py ++++ mycli/mycli/packages/cli_helpers/tabular_output/vertical_table_adapter.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- +"""Format data into a vertical table layout.""" @@ -1258,11 +1206,9 @@ index 0000000..4a44521 + """Wrap vertical table in a function for TabularOutputFormatter.""" + keys = ('sep_title', 'sep_character', 'sep_length') + return vertical_table(data, headers, **filter_dict_by_key(kwargs, keys)) -diff --git a/mycli/packages/cli_helpers/utils.py b/mycli/packages/cli_helpers/utils.py -new file mode 100644 -index 0000000..5a5c032 ---- /dev/null -+++ b/mycli/packages/cli_helpers/utils.py +diff -Naurp mycli.orig/mycli/packages/cli_helpers/utils.py mycli/mycli/packages/cli_helpers/utils.py +--- mycli.orig/mycli/packages/cli_helpers/utils.py ++++ mycli/mycli/packages/cli_helpers/utils.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +"""Various utility functions and helpers.""" @@ -1334,10 +1280,9 @@ index 0000000..5a5c032 + for r in replace: + s = s.replace(*r) + return s -diff --git a/mycli/packages/tabular_output/sql_format.py b/mycli/packages/tabular_output/sql_format.py -index 3ad0aa2..28576ae 100644 ---- a/mycli/packages/tabular_output/sql_format.py -+++ b/mycli/packages/tabular_output/sql_format.py +diff -Naurp mycli.orig/mycli/packages/tabular_output/sql_format.py mycli/mycli/packages/tabular_output/sql_format.py +--- mycli.orig/mycli/packages/tabular_output/sql_format.py ++++ mycli/mycli/packages/tabular_output/sql_format.py @@ -1,6 +1,6 @@ """Format adapter for sql.""" -- cgit v1.2.3