A few style changes originally done in the distutils2 repo
diff --git a/Lib/packaging/command/build_scripts.py b/Lib/packaging/command/build_scripts.py
index fe14e0a..d651ae0 100644
--- a/Lib/packaging/command/build_scripts.py
+++ b/Lib/packaging/command/build_scripts.py
@@ -3,7 +3,7 @@
import os
import re
import sysconfig
-import tokenize
+from tokenize import detect_encoding
from packaging.command.cmd import Command
from packaging.util import convert_path, newer
@@ -83,7 +83,7 @@
raise
f = None
else:
- encoding, lines = tokenize.detect_encoding(f.readline)
+ encoding, lines = detect_encoding(f.readline)
f.seek(0)
first_line = f.readline()
if not first_line:
diff --git a/Lib/packaging/create.py b/Lib/packaging/create.py
index 1e84e2e..34a8c82 100644
--- a/Lib/packaging/create.py
+++ b/Lib/packaging/create.py
@@ -25,10 +25,11 @@
import glob
import shutil
import sysconfig
-import tokenize
from hashlib import md5
from textwrap import dedent
+from tokenize import detect_encoding
from configparser import RawConfigParser
+
# importing this with an underscore as it should be replaced by the
# dict form or another structures for all purposes
from packaging._trove import all_classifiers as _CLASSIFIERS_LIST
@@ -111,7 +112,7 @@
been loaded before, because we are monkey patching its setup function with
a particular one"""
with open("setup.py", "rb") as f:
- encoding, lines = tokenize.detect_encoding(f.readline)
+ encoding, lines = detect_encoding(f.readline)
with open("setup.py", encoding=encoding) as f:
imp.load_module("setup", f, "setup.py", (".py", "r", imp.PY_SOURCE))