apply black

3 files changed, 63 insertions, 67 deletions

diff --git a/scripts/generate_identifier_pattern.py b/scripts/generate_identifier_pattern.py
index 7db5f4a..96fedba 100755
--- a/scripts/generate_identifier_pattern.py
+++ b/scripts/generate_identifier_pattern.py
@@ -5,7 +5,7 @@ import re
 import sys
 
 if sys.version_info[0] < 3:
-    raise RuntimeError('This needs to run on Python 3.')
+    raise RuntimeError("This needs to run on Python 3.")
 
 
 def get_characters():
@@ -23,7 +23,7 @@ def get_characters():
     for cp in range(sys.maxunicode + 1):
         s = chr(cp)
 
-        if ('a' + s).isidentifier() and not re.match(r'\w', s):
+        if ("a" + s).isidentifier() and not re.match(r"\w", s):
             yield s
 
 
@@ -33,10 +33,7 @@ def collapse_ranges(data):
 
     Source: https://stackoverflow.com/a/4629241/400617
     """
-    for a, b in itertools.groupby(
-        enumerate(data),
-        lambda x: ord(x[1]) - x[0]
-    ):
+    for a, b in itertools.groupby(enumerate(data), lambda x: ord(x[1]) - x[0]):
         b = list(b)
         yield b[0][1], b[-1][1]
 
@@ -55,23 +52,23 @@ def build_pattern(ranges):
             out.append(a)
             out.append(b)
         else:
-            out.append(f'{a}-{b}')
+            out.append("{}-{}".format(a, b))
 
-    return ''.join(out)
+    return "".join(out)
 
 
 def main():
     """Build the regex pattern and write it to the file
     :file:`jinja2/_identifier.py`."""
     pattern = build_pattern(collapse_ranges(get_characters()))
-    filename = os.path.abspath(os.path.join(
-        os.path.dirname(__file__), '..', 'jinja2', '_identifier.py'
-    ))
+    filename = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), "..", "src", "jinja2", "_identifier.py")
+    )
 
-    with open(filename, 'w', encoding='utf8') as f:
-        f.write('# generated by scripts/generate_identifier_pattern.py\n')
-        f.write(f'pattern = \'{pattern}\'\n')
+    with open(filename, "w", encoding="utf8") as f:
+        f.write("# generated by scripts/generate_identifier_pattern.py\n")
+        f.write('pattern = "{}"\n'.format(pattern))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/scripts/jinja2-debug.py b/scripts/jinja2-debug.py
index 4f04436..96628dd 100755
--- a/scripts/jinja2-debug.py
+++ b/scripts/jinja2-debug.py
@@ -17,21 +17,23 @@ from werkzeug import script
 
 import jinja2
 
-env = jinja2.Environment(extensions=['jinja2.ext.i18n', 'jinja2.ext.do',
-                                     'jinja2.ext.loopcontrols',
-                                     'jinja2.ext.with_',
-                                     'jinja2.ext.autoescape'],
-                         autoescape=True)
+env = jinja2.Environment(
+    extensions=[
+        "jinja2.ext.i18n",
+        "jinja2.ext.do",
+        "jinja2.ext.loopcontrols",
+        "jinja2.ext.with_",
+        "jinja2.ext.autoescape",
+    ],
+    autoescape=True,
+)
+
 
 def shell_init_func():
     def _compile(x):
         print(env.compile(x, raw=True))
-    result = {
-        'e':        env,
-        'c':        _compile,
-        't':        env.from_string,
-        'p':        env.parse
-    }
+
+    result = {"e": env, "c": _compile, "t": env.from_string, "p": env.parse}
     for key in jinja2.__all__:
         result[key] = getattr(jinja2, key)
     return result
@@ -40,8 +42,9 @@ def shell_init_func():
 def action_compile():
     print(env.compile(sys.stdin.read(), raw=True))
 
+
 action_shell = script.make_shell(shell_init_func)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     script.run()
diff --git a/scripts/make-release.py b/scripts/make-release.py
index 0b158dd..cd6ce23 100644
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -20,21 +20,21 @@ from datetime import datetime
 from subprocess import PIPE
 from subprocess import Popen
 
-_date_strip_re = re.compile(r'(?<=\d)(st|nd|rd|th)')
+_date_strip_re = re.compile(r"(?<=\d)(st|nd|rd|th)")
 
 
 def parse_changelog():
-    with open('CHANGES.rst') as f:
+    with open("CHANGES.rst") as f:
         lineiter = iter(f)
         for line in lineiter:
-            match = re.search('^Version\s+(.*)', line.strip())
+            match = re.search("^Version\s+(.*)", line.strip())
 
             if match is None:
                 continue
 
             version = match.group(1).strip()
 
-            if next(lineiter).count('-') != len(match.group(0)):
+            if next(lineiter).count("-") != len(match.group(0)):
                 continue
 
             while 1:
@@ -44,8 +44,8 @@ def parse_changelog():
                     break
 
             match = re.search(
-                r'(?:codename (.*),\s*)?released on (\w+\s+\d+\w+\s+\d+)(?i)',
-                change_info
+                r"(?:codename (.*),\s*)?released on (\w+\s+\d+\w+\s+\d+)(?i)",
+                change_info,
             )
 
             if match is None:
@@ -57,17 +57,17 @@ def parse_changelog():
 
 def bump_version(version):
     try:
-        parts = [int(i) for i in version.split('.')]
+        parts = [int(i) for i in version.split(".")]
     except ValueError:
-        fail('Current version is not numeric')
+        fail("Current version is not numeric")
 
     parts[-1] += 1
-    return '.'.join(map(str, parts))
+    return ".".join(map(str, parts))
 
 
 def parse_date(string):
-    string = _date_strip_re.sub('', string)
-    return datetime.strptime(string, '%B %d %Y')
+    string = _date_strip_re.sub("", string)
+    return datetime.strptime(string, "%B %d %Y")
 
 
 def set_filename_version(filename, version_number, pattern):
@@ -80,34 +80,33 @@ def set_filename_version(filename, version_number, pattern):
 
     with open(filename) as f:
         contents = re.sub(
-            r"^(\s*%s\s*=\s*')(.+?)(')(?sm)" % pattern,
-            inject_version, f.read()
+            r"^(\s*%s\s*=\s*')(.+?)(')(?sm)" % pattern, inject_version, f.read()
         )
 
     if not changed:
-        fail('Could not find %s in %s', pattern, filename)
+        fail("Could not find %s in %s", pattern, filename)
 
-    with open(filename, 'w') as f:
+    with open(filename, "w") as f:
         f.write(contents)
 
 
 def set_init_version(version):
-    info('Setting __init__.py version to %s', version)
-    set_filename_version('jinja2/__init__.py', version, '__version__')
+    info("Setting __init__.py version to %s", version)
+    set_filename_version("jinja2/__init__.py", version, "__version__")
 
 
 def set_setup_version(version):
-    info('Setting setup.py version to %s', version)
-    set_filename_version('setup.py', version, 'version')
+    info("Setting setup.py version to %s", version)
+    set_filename_version("setup.py", version, "version")
 
 
 def build_and_upload():
-    cmd = [sys.executable, 'setup.py', 'sdist', 'bdist_wheel']
+    cmd = [sys.executable, "setup.py", "sdist", "bdist_wheel"]
     Popen(cmd).wait()
 
 
 def fail(message, *args):
-    print('Error:', message % args, file=sys.stderr)
+    print("Error:", message % args, file=sys.stderr)
     sys.exit(1)
 
 
@@ -116,39 +115,39 @@ def info(message, *args):
 
 
 def get_git_tags():
-    return set(
-        Popen(['git', 'tag'], stdout=PIPE).communicate()[0].splitlines()
-    )
+    return set(Popen(["git", "tag"], stdout=PIPE).communicate()[0].splitlines())
 
 
 def git_is_clean():
-    return Popen(['git', 'diff', '--quiet']).wait() == 0
+    return Popen(["git", "diff", "--quiet"]).wait() == 0
 
 
 def make_git_commit(message, *args):
     message = message % args
-    Popen(['git', 'commit', '-am', message]).wait()
+    Popen(["git", "commit", "-am", message]).wait()
 
 
 def make_git_tag(tag):
     info('Tagging "%s"', tag)
-    Popen(['git', 'tag', tag]).wait()
+    Popen(["git", "tag", tag]).wait()
 
 
 def main():
-    os.chdir(os.path.join(os.path.dirname(__file__), '..'))
+    os.chdir(os.path.join(os.path.dirname(__file__), ".."))
 
     rv = parse_changelog()
 
     if rv is None:
-        fail('Could not parse changelog')
+        fail("Could not parse changelog")
 
     version, release_date, codename = rv
-    dev_version = bump_version(version) + '.dev'
+    dev_version = bump_version(version) + ".dev"
 
     info(
-        'Releasing %s (codename %s, release date %s)',
-        version, codename, release_date.strftime('%d/%m/%Y')
+        "Releasing %s (codename %s, release date %s)",
+        version,
+        codename,
+        release_date.strftime("%d/%m/%Y"),
     )
     tags = get_git_tags()
 
@@ -156,27 +155,24 @@ def main():
         fail('Version "%s" is already tagged', version)
 
     if release_date.date() != date.today():
-        fail(
-            'Release date is not today (%s != %s)',
-            release_date.date(), date.today()
-        )
+        fail("Release date is not today (%s != %s)", release_date.date(), date.today())
 
     if not git_is_clean():
-        fail('You have uncommitted changes in git')
+        fail("You have uncommitted changes in git")
 
     try:
         import wheel
     except ImportError:
-        fail('You need to install the wheel package.')
+        fail("You need to install the wheel package.")
 
     set_init_version(version)
     set_setup_version(version)
-    make_git_commit('Bump version number to %s', version)
+    make_git_commit("Bump version number to %s", version)
     make_git_tag(version)
     build_and_upload()
     set_init_version(dev_version)
     set_setup_version(dev_version)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()