Sourcery refactored main branch

scripts/generate_identifier_pattern.py

@@ -19,7 +19,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 f"a{s}".isidentifier() and not re.match(r"\w", s):
             yield s
 
 
@@ -45,8 +45,7 @@ def build_pattern(ranges):
         if a == b:  # single char
             out.append(a)
         elif ord(b) - ord(a) == 1:  # two chars, range is redundant
-            out.append(a)
-            out.append(b)
+            out.extend((a, b))
         else:
             out.append(f"{a}-{b}")
 

src/jinja2/async_utils.py

@@ -39,10 +39,7 @@ def wrapper(*args, **kwargs):  # type: ignore
             if need_eval_context:
                 args = args[1:]
 
-            if b:
-                return async_func(*args, **kwargs)
-
-            return normal_func(*args, **kwargs)
+            return async_func(*args, **kwargs) if b else normal_func(*args, **kwargs)
 
         if need_eval_context:
             wrapper = pass_eval_context(wrapper)

src/jinja2/compiler.py

@@ -90,7 +90,7 @@ def visitor(self: "CodeGenerator", node: nodes.UnaryExpr, frame: Frame) -> None:
             self.write(f"environment.call_unop(context, {op!r}, ")
             self.visit(node.node, frame)
         else:
-            self.write("(" + op)
+            self.write(f"({op}")
             self.visit(node.node, frame)
 
         self.write(")")
@@ -116,10 +116,7 @@ def generate(
     )
     generator.visit(node)
 
-    if stream is None:
-        return generator.stream.getvalue()  # type: ignore
-
-    return None
+    return generator.stream.getvalue() if stream is None else None
 
 
 def has_safe_repr(value: t.Any) -> bool:
@@ -596,10 +593,7 @@ def enter_frame(self, frame: Frame) -> None:
 
     def leave_frame(self, frame: Frame, with_python_scope: bool = False) -> None:
         if not with_python_scope:
-            undefs = []
-            for target in frame.symbols.loads:
-                undefs.append(target)
-            if undefs:
+            if undefs := list(frame.symbols.loads):
                 self.writeline(f"{' = '.join(undefs)} = missing")
 
     def choose_async(self, async_value: str = "async ", sync_value: str = "") -> str:
@@ -761,18 +755,14 @@ def get_context_ref(self) -> str:
 
     def get_resolve_func(self) -> str:
         target = self._context_reference_stack[-1]
-        if target == "context":
-            return "resolve"
-        return f"{target}.resolve"
+        return "resolve" if target == "context" else f"{target}.resolve"
 
     def derive_context(self, frame: Frame) -> str:
         return f"{self.get_context_ref()}.derived({self.dump_local_context(frame)})"
 
     def parameter_is_undeclared(self, target: str) -> bool:
         """Checks if a given target is an undeclared parameter."""
-        if not self._param_def_block:
-            return False
-        return target in self._param_def_block[-1]
+        return target in self._param_def_block[-1] if self._param_def_block else False
 
     def push_assign_tracking(self) -> None:
         """Pushes a new layer for assignment tracking."""
@@ -909,7 +899,7 @@ def visit_Template(
         # at this point we now have the blocks collected and can visit them too.
         for name, block in self.blocks.items():
             self.writeline(
-                f"{self.func('block_' + name)}(context, missing=missing{envenv}):",
+                f"{self.func(f'block_{name}')}(context, missing=missing{envenv}):",
                 block,
                 1,
             )
@@ -954,11 +944,7 @@ def visit_Block(self, node: nodes.Block, frame: Frame) -> None:
                 self.indent()
                 level += 1
 
-        if node.scoped:
-            context = self.derive_context(frame)
-        else:
-            context = self.get_context_ref()
-
+        context = self.derive_context(frame) if node.scoped else self.get_context_ref()
         if node.required:
             self.writeline(f"if len(context.blocks[{node.name!r}]) <= 1:", node)
             self.indent()
@@ -1530,9 +1516,9 @@ def visit_Output(self, node: nodes.Output, frame: Frame) -> None:
                 val = self._output_const_repr(item)
 
                 if frame.buffer is None:
-                    self.writeline("yield " + val)
+                    self.writeline(f"yield {val}")
                 else:
-                    self.writeline(val + ",")
+                    self.writeline(f"{val},")
             else:
                 if frame.buffer is None:
                     self.writeline("yield ", item)
@@ -1860,7 +1846,7 @@ def visit_Call(
             self.write("))")
 
     def visit_Keyword(self, node: nodes.Keyword, frame: Frame) -> None:
-        self.write(node.key + "=")
+        self.write(f"{node.key}=")
         self.visit(node.value, frame)
 
     # -- Unused nodes for extensions
@@ -1880,7 +1866,7 @@ def visit_MarkSafeIfAutoescape(
     def visit_EnvironmentAttribute(
         self, node: nodes.EnvironmentAttribute, frame: Frame
     ) -> None:
-        self.write("environment." + node.name)
+        self.write(f"environment.{node.name}")
 
     def visit_ExtensionAttribute(
         self, node: nodes.ExtensionAttribute, frame: Frame

src/jinja2/debug.py

@@ -154,11 +154,7 @@ def get_template_locals(real_locals: t.Mapping[str, t.Any]) -> t.Dict[str, t.Any
     # Start with the current template context.
     ctx: "t.Optional[Context]" = real_locals.get("context")
 
-    if ctx is not None:
-        data: t.Dict[str, t.Any] = ctx.get_all().copy()
-    else:
-        data = {}
-
+    data = ctx.get_all().copy() if ctx is not None else {}
     # Might be in a derived context that only sets local variables
     # rather than pushing a context. Local variables follow the scheme
     # l_depth_name. Find the highest-depth local that has a value for

src/jinja2/environment.py

@@ -84,10 +84,7 @@ def create_cache(
     if size == 0:
         return None
 
-    if size < 0:
-        return {}
-
-    return LRUCache(size)  # type: ignore
+    return {} if size < 0 else LRUCache(size)
 
 
 def copy_cache(
@@ -99,10 +96,7 @@ def copy_cache(
     if cache is None:
         return None
 
-    if type(cache) is dict:
-        return {}
-
-    return LRUCache(cache.capacity)  # type: ignore
+    return {} if type(cache) is dict else LRUCache(cache.capacity)
 
 
 def load_extensions(
@@ -535,11 +529,7 @@ def _filter_test_common(
             args.insert(0, context)
         elif pass_arg is _PassArg.eval_context:
             if eval_ctx is None:
-                if context is not None:
-                    eval_ctx = context.eval_ctx
-                else:
-                    eval_ctx = EvalContext(self)
-
+                eval_ctx = context.eval_ctx if context is not None else EvalContext(self)
             args.insert(0, eval_ctx)
         elif pass_arg is _PassArg.environment:
             args.insert(0, self)
@@ -633,7 +623,7 @@ def lex(
         of the extensions to be applied you have to filter source through
         the :meth:`preprocess` method.
         """
-        source = str(source)
+        source = source
         try:
             return self.lexer.tokeniter(source, name, filename)
         except TemplateSyntaxError:
@@ -652,7 +642,7 @@ def preprocess(
         return reduce(
             lambda s, e: e.preprocess(s, name, filename),
             self.iter_extensions(),
-            str(source),
+            source,
         )
 
     def _tokenize(
@@ -1439,9 +1429,7 @@ def _get_default_module(self, ctx: t.Optional[Context] = None) -> "TemplateModul
             raise RuntimeError("Module is not available in async mode.")
 
         if ctx is not None:
-            keys = ctx.globals_keys - self.globals.keys()
-
-            if keys:
+            if keys := ctx.globals_keys - self.globals.keys():
                 return self.make_module({k: ctx.parent[k] for k in keys})
 
         if self._module is None:
@@ -1453,9 +1441,7 @@ async def _get_default_module_async(
         self, ctx: t.Optional[Context] = None
     ) -> "TemplateModule":
         if ctx is not None:
-            keys = ctx.globals_keys - self.globals.keys()
-
-            if keys:
+            if keys := ctx.globals_keys - self.globals.keys():
                 return await self.make_module_async({k: ctx.parent[k] for k in keys})
 
         if self._module is None:
@@ -1483,17 +1469,19 @@ def get_corresponding_lineno(self, lineno: int) -> int:
         """Return the source line number of a line number in the
         generated bytecode as they are not in sync.
         """
-        for template_line, code_line in reversed(self.debug_info):
-            if code_line <= lineno:
-                return template_line
-        return 1
+        return next(
+            (
+                template_line
+                for template_line, code_line in reversed(self.debug_info)
+                if code_line <= lineno
+            ),
+            1,
+        )
 
     @property
     def is_up_to_date(self) -> bool:
         """If this variable is `False` there is a newer version available."""
-        if self._uptodate is None:
-            return True
-        return self._uptodate()
+        return True if self._uptodate is None else self._uptodate()
 
     @property
     def debug_info(self) -> t.List[t.Tuple[int, int]]:
@@ -1507,10 +1495,7 @@ def debug_info(self) -> t.List[t.Tuple[int, int]]:
         return []
 
     def __repr__(self) -> str:
-        if self.name is None:
-            name = f"memory:{id(self):x}"
-        else:
-            name = repr(self.name)
+        name = f"memory:{id(self):x}" if self.name is None else repr(self.name)
         return f"<{type(self).__name__} {name}>"
 
 
@@ -1547,10 +1532,7 @@ def __str__(self) -> str:
         return concat(self._body_stream)
 
     def __repr__(self) -> str:
-        if self.__name__ is None:
-            name = f"memory:{id(self):x}"
-        else:
-            name = repr(self.__name__)
+        name = f"memory:{id(self):x}" if self.__name__ is None else repr(self.__name__)
         return f"<{type(self).__name__} {name}>"
 
 

src/jinja2/exceptions.py

@@ -112,10 +112,9 @@ def __str__(self) -> str:
 
         # otherwise attach some stuff
         location = f"line {self.lineno}"
-        name = self.filename or self.name
-        if name:
+        if name := self.filename or self.name:
             location = f'File "{name}", {location}'
-        lines = [t.cast(str, self.message), "  " + location]
+        lines = [t.cast(str, self.message), f"  {location}"]
 
         # if the source is set, add the line to the output
         if self.source is not None:
@@ -124,7 +123,7 @@ def __str__(self) -> str:
             except IndexError:
                 pass
             else:
-                lines.append("    " + line.strip())
+                lines.append(f"    {line.strip()}")
 
         return "\n".join(lines)
 

src/jinja2/ext.py

@@ -355,12 +355,9 @@ def parse(self, parser: "Parser") -> t.Union[nodes.Node, t.List[nodes.Node]]:
         """Parse a translatable tag."""
         lineno = next(parser.stream).lineno
 
-        context = None
         context_token = parser.stream.next_if("string")
 
-        if context_token is not None:
-            context = context_token.value
-
+        context = context_token.value if context_token is not None else None
         # find all the variables referenced.  Additionally a variable can be
         # defined in the body of the trans block too, but this is checked at
         # a later state.
@@ -712,11 +709,7 @@ def extract_from_ast(
             if not out:
                 continue
         else:
-            if len(strings) == 1:
-                out = strings[0]
-            else:
-                out = tuple(strings)
-
+            out = strings[0] if len(strings) == 1 else tuple(strings)
         yield node.lineno, node.node.name, out