Remove redundant 3.6 code and bump mypy's python_version to 3.7 (#3313)

[etc/vim.git] / autoload / black.vim

diff --git a/autoload/black.vim b/autoload/black.vim
index 6c381b431a36ebb0d03f6d7792b1efe4937652dd..eec446379503873f0fc38ab93edf45dbfb830708 100644 (file)
--- a/autoload/black.vim
+++ b/autoload/black.vim
@@ -30,6 +30,7 @@ FLAGS = [
   Flag(name="skip_string_normalization", cast=strtobool),
   Flag(name="quiet", cast=strtobool),
   Flag(name="skip_magic_trailing_comma", cast=strtobool),
   Flag(name="skip_string_normalization", cast=strtobool),
   Flag(name="quiet", cast=strtobool),
   Flag(name="skip_magic_trailing_comma", cast=strtobool),

+  Flag(name="preview", cast=strtobool),

 ]
 
 
 ]
 
 


@@ -56,8 +57,8 @@ def _get_virtualenv_site_packages(venv_path, pyver):
 
 def _initialize_black_env(upgrade=False):
   pyver = sys.version_info[:3]
 
 def _initialize_black_env(upgrade=False):
   pyver = sys.version_info[:3]

-  if pyver < (3, 6, 2):
-    print("Sorry, Black requires Python 3.6.2+ to run.")
+  if pyver < (3, 7):
+    print("Sorry, Black requires Python 3.7+ to run.")

     return False
 
   from pathlib import Path
     return False
 
   from pathlib import Path


@@ -145,6 +146,7 @@ def Black(**kwargs):
     string_normalization=not configs["skip_string_normalization"],
     is_pyi=vim.current.buffer.name.endswith('.pyi'),
     magic_trailing_comma=not configs["skip_magic_trailing_comma"],
     string_normalization=not configs["skip_string_normalization"],
     is_pyi=vim.current.buffer.name.endswith('.pyi'),
     magic_trailing_comma=not configs["skip_magic_trailing_comma"],

+    preview=configs["preview"],

     **black_kwargs,
   )
   quiet = configs["quiet"]
     **black_kwargs,
   )
   quiet = configs["quiet"]


@@ -158,9 +160,9 @@ def Black(**kwargs):
     )
   except black.NothingChanged:
     if not quiet:
     )
   except black.NothingChanged:
     if not quiet:

-      print(f'Already well formatted, good job. (took {time.time() - start:.4f}s)')
+      print(f'Black: already well formatted, good job. (took {time.time() - start:.4f}s)')

   except Exception as exc:
   except Exception as exc:

-    print(exc)
+    print(f'Black: {exc}')

   else:
     current_buffer = vim.current.window.buffer
     cursors = []
   else:
     current_buffer = vim.current.window.buffer
     cursors = []


@@ -177,7 +179,7 @@ def Black(**kwargs):
       except vim.error:
         window.cursor = (len(window.buffer), 0)
     if not quiet:
       except vim.error:
         window.cursor = (len(window.buffer), 0)
     if not quiet:

-      print(f'Reformatted in {time.time() - start:.4f}s.')
+      print(f'Black: reformatted in {time.time() - start:.4f}s.')

 
 def get_configs():
   filename = vim.eval("@%")
 
 def get_configs():
   filename = vim.eval("@%")