Removed deprecated support for positional args on Extension class.

Author: waylan

markdown/extensions/__init__.py

@@ -20,34 +20,8 @@ class Extension(object):
  # if a default is not set here.
  config = {}
 
- def __init__(self, *args, **kwargs):
+ def __init__(self, **kwargs):
  """ Initiate Extension and set up configs. """
-
- # check for configs arg for backward compat.
- # (there only ever used to be one so we use arg[0])
- if len(args):
- if args[0] is not None:
- self.setConfigs(args[0])
- warnings.warn('Extension classes accepting positional args is '
- 'pending Deprecation. Each setting should be '
- 'passed into the Class as a keyword. Positional '
- 'args are deprecated and will raise '
- 'an error in version 2.7. See the Release Notes for '
- 'Python-Markdown version 2.6 for more info.',
- DeprecationWarning)
- # check for configs kwarg for backward compat.
- if 'configs' in kwargs.keys():
- if kwargs['configs'] is not None:
- self.setConfigs(kwargs.pop('configs', {}))
- warnings.warn('Extension classes accepting a dict on the single '
- 'keyword "config" is pending Deprecation. Each '
- 'setting should be passed into the Class as a '
- 'keyword directly. The "config" keyword is '
- 'deprecated and raise an error in '
- 'version 2.7. See the Release Notes for '
- 'Python-Markdown version 2.6 for more info.',
- DeprecationWarning)
- # finally, use kwargs
  self.setConfigs(kwargs)
 
  def getConfig(self, key, default=''):

markdown/extensions/abbr.py

@@ -87,5 +87,5 @@ def handleMatch(self, m):
  return abbr
 
 
-def makeExtension(*args, **kwargs):
- return AbbrExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return AbbrExtension(**kwargs)

markdown/extensions/admonition.py

@@ -92,5 +92,5 @@ def get_class_and_title(self, match):
  return klass, title
 
 
-def makeExtension(*args, **kwargs):
- return AdmonitionExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return AdmonitionExtension(**kwargs)

markdown/extensions/attr_list.py

@@ -173,5 +173,5 @@ def extendMarkdown(self, md, md_globals):
  )
 
 
-def makeExtension(*args, **kwargs):
- return AttrListExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return AttrListExtension(**kwargs)

markdown/extensions/codehilite.py

@@ -227,7 +227,7 @@ def run(self, root):
 class CodeHiliteExtension(Extension):
  """ Add source code hilighting to markdown codeblocks. """
 
- def __init__(self, *args, **kwargs):
+ def __init__(self, **kwargs):
  # define default configs
  self.config = {
  'linenums': [None,
@@ -249,7 +249,7 @@ def __init__(self, *args, **kwargs):
  'Default: True']
  }
 
- super(CodeHiliteExtension, self).__init__(*args, **kwargs)
+ super(CodeHiliteExtension, self).__init__(**kwargs)
 
  def extendMarkdown(self, md, md_globals):
  """ Add HilitePostprocessor to Markdown instance. """
@@ -260,5 +260,5 @@ def extendMarkdown(self, md, md_globals):
  md.registerExtension(self)
 
 
-def makeExtension(*args, **kwargs):
- return CodeHiliteExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return CodeHiliteExtension(**kwargs)

markdown/extensions/def_list.py

@@ -111,5 +111,5 @@ def extendMarkdown(self, md, md_globals):
  '>ulist')
 
 
-def makeExtension(*args, **kwargs):
- return DefListExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return DefListExtension(**kwargs)

markdown/extensions/extra.py

@@ -50,10 +50,8 @@
 class ExtraExtension(Extension):
  """ Add various extensions to Markdown class."""
 
- def __init__(self, *args, **kwargs):
- """ config is a dumb holder which gets passed to actual ext later. """
- self.config = kwargs.pop('configs', {})
- self.config.update(kwargs)
+ def __init__(self, **kwargs):
+ self.config = kwargs
 
  def extendMarkdown(self, md, md_globals):
  """ Register extension instances. """
@@ -68,8 +66,8 @@ def extendMarkdown(self, md, md_globals):
  r'^(p|h[1-6]|li|dd|dt|td|th|legend|address)$', re.IGNORECASE)
 
 
-def makeExtension(*args, **kwargs):
- return ExtraExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return ExtraExtension(**kwargs)
 
 
 class MarkdownInHtmlProcessor(BlockProcessor):

markdown/extensions/fenced_code.py

@@ -108,5 +108,5 @@ def _escape(self, txt):
  return txt
 
 
-def makeExtension(*args, **kwargs):
- return FencedCodeExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return FencedCodeExtension(**kwargs)

markdown/extensions/footnotes.py

@@ -33,7 +33,7 @@
 class FootnoteExtension(Extension):
  """ Footnote Extension. """
 
- def __init__(self, *args, **kwargs):
+ def __init__(self, **kwargs):
  """ Setup configs. """
 
  self.config = {
@@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs):
  "The text string that links from the footnote "
  "to the reader's place."]
  }
- super(FootnoteExtension, self).__init__(*args, **kwargs)
+ super(FootnoteExtension, self).__init__(**kwargs)
 
  # In multiple invocations, emit links that don't get tangled.
  self.unique_prefix = 0
@@ -314,6 +314,6 @@ def run(self, text):
  return text.replace(NBSP_PLACEHOLDER, " ")
 
 
-def makeExtension(*args, **kwargs):
+def makeExtension(**kwargs):
  """ Return an instance of the FootnoteExtension """
- return FootnoteExtension(*args, **kwargs)
+ return FootnoteExtension(**kwargs)

markdown/extensions/headerid.py

@@ -61,7 +61,7 @@ def _get_meta(self):
 
 
 class HeaderIdExtension(Extension):
- def __init__(self, *args, **kwargs):
+ def __init__(self, **kwargs):
  # set defaults
  self.config = {
  'level': ['1', 'Base level for headers.'],
@@ -70,7 +70,7 @@ def __init__(self, *args, **kwargs):
  'slugify': [slugify, 'Callable to generate anchors']
  }
 
- super(HeaderIdExtension, self).__init__(*args, **kwargs)
+ super(HeaderIdExtension, self).__init__(**kwargs)
 
  warnings.warn(
  'The HeaderId Extension is pending deprecation. Use the TOC Extension instead.',
@@ -93,5 +93,5 @@ def reset(self):
  self.processor.IDs = set()
 
 
-def makeExtension(*args, **kwargs):
- return HeaderIdExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+ return HeaderIdExtension(**kwargs)