isort, black and 2to3

Author: jesseward

discogs_cli/discogs.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import click
+from discogs_client import Client
 
 from .__init__ import __version__
-from discogs_client import Client
 
 
-class Discogs(object):
+class Discogs:
     """Wraps the discogs_client library. Encapsulating Search, Artist
     Release, Master, Label objects. Utility functionality in order to
     render output for terminal consumption.

discogs_cli/ext/completer.py

@@ -13,12 +13,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from __future__ import unicode_literals
-from __future__ import print_function
 
 from prompt_toolkit.completion import Completer
 
-from ..completions import SUBCOMMANDS, ARGS_OPTS_LOOKUP
+from ..completions import ARGS_OPTS_LOOKUP, SUBCOMMANDS
 
 
 class Completer(Completer):
@@ -107,7 +105,7 @@ def completing_subcommand_option(self, words, word_before_cursor):
         :return: A list of options.
         """
         options = []
-        for subcommand, args_opts in ARGS_OPTS_LOOKUP.items():
+        for subcommand, _ in list(ARGS_OPTS_LOOKUP.items()):
             if subcommand in words and (
                 words[-2] == subcommand
                 or self.completing_subcommand_option_util(subcommand, words)
@@ -151,7 +149,7 @@ def arg_completions(self, words, word_before_cursor):
         """
         if "ogs" not in words:
             return []
-        for subcommand, args_opts in ARGS_OPTS_LOOKUP.items():
+        for subcommand, _ in list(ARGS_OPTS_LOOKUP.items()):
             if subcommand in words:
                 return [ARGS_OPTS_LOOKUP[subcommand]["args"]]
         return ["10"]

discogs_cli/ext/utils.py

@@ -13,19 +13,16 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from __future__ import unicode_literals
-from __future__ import print_function
-
 import re
+import shlex
 
 import six
-import shlex
 from prompt_toolkit.completion import Completion
 
 from ..completions import META_LOOKUP
 
 
-class TextUtils(object):
+class TextUtils:
     """Utilities for parsing and matching text."""
 
     def find_matches(self, word, collection, fuzzy):

discogs_cli/main.py

@@ -1,20 +1,19 @@
 # -*- coding: utf-8 -*-
 
-import click
 import subprocess
 
+import click
 from prompt_toolkit import prompt
 from prompt_toolkit.history import InMemoryHistory
 from prompt_toolkit.lexers import PygmentsLexer
 from prompt_toolkit.styles.pygments import style_from_pygments_cls
 from pygments.styles import get_style_by_name
 
 from .__init__ import __version__
-
 # from .completion import command_completer
 from .ext.completer import Completer
-from .pyglexer import DiscogsCliLexer
 from .ext.utils import TextUtils
+from .pyglexer import DiscogsCliLexer
 
 EXIT = ["quit", "exit", "logoff", "sys64738"]
 TOKEN = "ogs "

discogs_cli/main_cli.py

@@ -1,13 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import click
 import os
 
-from .discogs import Release, Artist, Label, Search, Master
-
-import requests
+import click
 
-requests.packages.urllib3.disable_warnings()
+from .discogs import Artist, Label, Master, Release, Search
 
 
 @click.group()

discogs_cli/pyglexer.py

@@ -1,5 +1,5 @@
 from pygments.lexer import RegexLexer, bygroups
-from pygments.token import Text, String, Keyword, Operator
+from pygments.token import Keyword, Operator, String, Text
 
 __all__ = ["DiscogsCliLexer"]