Merge branch 'master' into mypy

Author: madzak

README.md

@@ -170,3 +170,5 @@ External Examples
 =================
 
 - [Wesley Tanaka - Structured log files in Python using python-json-logger](https://wtanaka.com/node/8201)
+
+- [Archive](https://web.archive.org/web/20201130054012/https://wtanaka.com/node/8201)

src/pythonjsonlogger/jsonlogger.py

@@ -146,13 +146,18 @@ def parse(self) -> List[str]:
 
         This method is responsible for returning a list of fields (as strings)
         to include in all log messages.
-        """
-        standard_formatters = re.compile(r'\((.+?)\)', re.IGNORECASE)
-
-        if self._fmt:
-            return standard_formatters.findall(self._fmt)
+        """        
+        if isinstance(self._style, logging.StringTemplateStyle):
+            formatter_style_pattern = re.compile(r'\$\{(.+?)\}', re.IGNORECASE)
+        elif isinstance(self._style, logging.StrFormatStyle):
+            formatter_style_pattern = re.compile(r'\{(.+?)\}', re.IGNORECASE)
+        # PercentStyle is parent class of StringTemplateStyle and StrFormatStyle so
+        # it needs to be checked last.
+        elif isinstance(self._style, logging.PercentStyle):
+            formatter_style_pattern = re.compile(r'%\((.+?)\)s', re.IGNORECASE)
         else:
-            return []
+            raise ValueError('Invalid format: %s' % self._fmt)
+        return formatter_style_pattern.findall(self._fmt)
 
     def add_fields(self, log_record, record, message_dict):
         """