Merge hell

uncompyle6/bin/uncompile.py

@@ -5,12 +5,10 @@
 # by Rocky Bernstein
 # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #
-from __future__ import print_function
 
 import os
 import sys
 import time
-from typing import List
 
 import click
 from xdis.version_info import version_tuple_to_str
@@ -31,7 +29,6 @@ def usage():
 # Usage:
 #   %s [OPTIONS]... [ FILE | DIR]...
 #   %s [--help | -h | --V | --version]
->>>>>>> master
 
 # Examples:
 #   %s      foo.pyc bar.pyc       # decompile foo.pyc, bar.pyc to stdout
@@ -160,11 +157,11 @@ def main_bin(
     """
 
     version_tuple = sys.version_info[0:2]
-    if version_tuple < (3, 7):
+    if not ((3, 3) <= version_tuple < (3, 6)):
         print(
-            f"Error: This version of the {program} runs from Python 3.7 or greater."
-            f"You need another branch of this code for Python before 3.7."
-            f""" \n\tYou have version: {version_tuple_to_str()}."""
+            "Error: This version of the {program} runs from Python 3.3 to 3.6."
+            "You need another branch of this code for other Python versions."
+            " \n\tYou have version: %s." % version_tuple_to_str()
         )
         sys.exit(-1)
 
@@ -172,7 +169,7 @@ def main_bin(
     out_base = None
 
     out_base = None
-    source_paths: List[str] = []
+    source_paths = []
     timestamp = False
     timestampfmt = "# %Y.%m.%d %H:%M:%S %Z"
     pyc_paths = files