Removed deprecated support for positional args on Extension class.

18 files changed, 49 insertions, 77 deletions

diff --git a/markdown/extensions/__init__.py b/markdown/extensions/__init__.py
index 6e7a08a..f0c16ac 100644
--- a/markdown/extensions/__init__.py
+++ b/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=''):
diff --git a/markdown/extensions/abbr.py b/markdown/extensions/abbr.py
index 353d126..83cef61 100644
--- a/markdown/extensions/abbr.py
+++ b/markdown/extensions/abbr.py
@@ -87,5 +87,5 @@ class AbbrPattern(Pattern):
         return abbr
 
 
-def makeExtension(*args, **kwargs):
-    return AbbrExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return AbbrExtension(**kwargs)
diff --git a/markdown/extensions/admonition.py b/markdown/extensions/admonition.py
index 76e0fb5..997cab3 100644
--- a/markdown/extensions/admonition.py
+++ b/markdown/extensions/admonition.py
@@ -92,5 +92,5 @@ class AdmonitionProcessor(BlockProcessor):
         return klass, title
 
 
-def makeExtension(*args, **kwargs):
-    return AdmonitionExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return AdmonitionExtension(**kwargs)
diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py
index 683bdf8..26cef4c 100644
--- a/markdown/extensions/attr_list.py
+++ b/markdown/extensions/attr_list.py
@@ -173,5 +173,5 @@ class AttrListExtension(Extension):
         )
 
 
-def makeExtension(*args, **kwargs):
-    return AttrListExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return AttrListExtension(**kwargs)
diff --git a/markdown/extensions/codehilite.py b/markdown/extensions/codehilite.py
index 1fcd35f..1c63e8e 100644
--- a/markdown/extensions/codehilite.py
+++ b/markdown/extensions/codehilite.py
@@ -227,7 +227,7 @@ class HiliteTreeprocessor(Treeprocessor):
 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 @@ class CodeHiliteExtension(Extension):
                              '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 @@ class CodeHiliteExtension(Extension):
         md.registerExtension(self)
 
 
-def makeExtension(*args, **kwargs):
-    return CodeHiliteExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return CodeHiliteExtension(**kwargs)
diff --git a/markdown/extensions/def_list.py b/markdown/extensions/def_list.py
index 77cca6e..45f8358 100644
--- a/markdown/extensions/def_list.py
+++ b/markdown/extensions/def_list.py
@@ -111,5 +111,5 @@ class DefListExtension(Extension):
                                       '>ulist')
 
 
-def makeExtension(*args, **kwargs):
-    return DefListExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return DefListExtension(**kwargs)
diff --git a/markdown/extensions/extra.py b/markdown/extensions/extra.py
index 494a921..4432158 100644
--- a/markdown/extensions/extra.py
+++ b/markdown/extensions/extra.py
@@ -50,10 +50,8 @@ extensions = [
 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 @@ class ExtraExtension(Extension):
             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):
diff --git a/markdown/extensions/fenced_code.py b/markdown/extensions/fenced_code.py
index 92a3971..d89a5ae 100644
--- a/markdown/extensions/fenced_code.py
+++ b/markdown/extensions/fenced_code.py
@@ -108,5 +108,5 @@ class FencedBlockPreprocessor(Preprocessor):
         return txt
 
 
-def makeExtension(*args, **kwargs):
-    return FencedCodeExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return FencedCodeExtension(**kwargs)
diff --git a/markdown/extensions/footnotes.py b/markdown/extensions/footnotes.py
index d8caae2..40a8fbb 100644
--- a/markdown/extensions/footnotes.py
+++ b/markdown/extensions/footnotes.py
@@ -33,7 +33,7 @@ TABBED_RE = re.compile(r'((\t)|(    ))(.*)')
 class FootnoteExtension(Extension):
     """ Footnote Extension. """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         """ Setup configs. """
 
         self.config = {
@@ -49,7 +49,7 @@ class FootnoteExtension(Extension):
                  "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 @@ class FootnotePostprocessor(Postprocessor):
         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)
diff --git a/markdown/extensions/headerid.py b/markdown/extensions/headerid.py
index 2cb20b9..33fa63b 100644
--- a/markdown/extensions/headerid.py
+++ b/markdown/extensions/headerid.py
@@ -61,7 +61,7 @@ class HeaderIdTreeprocessor(Treeprocessor):
 
 
 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 @@ class HeaderIdExtension(Extension):
             '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 @@ class HeaderIdExtension(Extension):
         self.processor.IDs = set()
 
 
-def makeExtension(*args, **kwargs):
-    return HeaderIdExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return HeaderIdExtension(**kwargs)
diff --git a/markdown/extensions/meta.py b/markdown/extensions/meta.py
index 711235e..4b83161 100644
--- a/markdown/extensions/meta.py
+++ b/markdown/extensions/meta.py
@@ -74,5 +74,5 @@ class MetaPreprocessor(Preprocessor):
         return lines
 
 
-def makeExtension(*args, **kwargs):
-    return MetaExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return MetaExtension(**kwargs)
diff --git a/markdown/extensions/nl2br.py b/markdown/extensions/nl2br.py
index 8acd60c..c293240 100644
--- a/markdown/extensions/nl2br.py
+++ b/markdown/extensions/nl2br.py
@@ -31,5 +31,5 @@ class Nl2BrExtension(Extension):
         md.inlinePatterns.add('nl', br_tag, '_end')
 
 
-def makeExtension(*args, **kwargs):
-    return Nl2BrExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return Nl2BrExtension(**kwargs)
diff --git a/markdown/extensions/sane_lists.py b/markdown/extensions/sane_lists.py
index 213c8a6..20b5967 100644
--- a/markdown/extensions/sane_lists.py
+++ b/markdown/extensions/sane_lists.py
@@ -43,5 +43,5 @@ class SaneListExtension(Extension):
         md.parser.blockprocessors['ulist'] = SaneUListProcessor(md.parser)
 
 
-def makeExtension(*args, **kwargs):
-    return SaneListExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return SaneListExtension(**kwargs)
diff --git a/markdown/extensions/smart_strong.py b/markdown/extensions/smart_strong.py
index 58570bb..62de375 100644
--- a/markdown/extensions/smart_strong.py
+++ b/markdown/extensions/smart_strong.py
@@ -37,5 +37,5 @@ class SmartEmphasisExtension(Extension):
         )
 
 
-def makeExtension(*args, **kwargs):
-    return SmartEmphasisExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return SmartEmphasisExtension(**kwargs)
diff --git a/markdown/extensions/smarty.py b/markdown/extensions/smarty.py
index 8e896b5..e973b09 100644
--- a/markdown/extensions/smarty.py
+++ b/markdown/extensions/smarty.py
@@ -166,7 +166,7 @@ class SubstituteTextPattern(HtmlPattern):
 
 
 class SmartyExtension(Extension):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.config = {
             'smart_quotes': [True, 'Educate quotes'],
             'smart_angled_quotes': [False, 'Educate angled quotes'],
@@ -174,7 +174,7 @@ class SmartyExtension(Extension):
             'smart_ellipses': [True, 'Educate ellipses'],
             'substitutions': [{}, 'Overwrite default substitutions'],
         }
-        super(SmartyExtension, self).__init__(*args, **kwargs)
+        super(SmartyExtension, self).__init__(**kwargs)
         self.substitutions = dict(substitutions)
         self.substitutions.update(self.getConfig('substitutions', default={}))
 
@@ -259,5 +259,5 @@ class SmartyExtension(Extension):
         md.ESCAPED_CHARS.extend(['"', "'"])
 
 
-def makeExtension(*args, **kwargs):
-    return SmartyExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return SmartyExtension(**kwargs)
diff --git a/markdown/extensions/tables.py b/markdown/extensions/tables.py
index 368321d..3d9bf03 100644
--- a/markdown/extensions/tables.py
+++ b/markdown/extensions/tables.py
@@ -98,5 +98,5 @@ class TableExtension(Extension):
                                       '<hashheader')
 
 
-def makeExtension(*args, **kwargs):
-    return TableExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return TableExtension(**kwargs)
diff --git a/markdown/extensions/toc.py b/markdown/extensions/toc.py
index 7de8165..9f62902 100644
--- a/markdown/extensions/toc.py
+++ b/markdown/extensions/toc.py
@@ -264,7 +264,7 @@ class TocExtension(Extension):
 
     TreeProcessorClass = TocTreeprocessor
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.config = {
             "marker": ['[TOC]',
                        'Text to find and replace with Table of Contents - '
@@ -285,7 +285,7 @@ class TocExtension(Extension):
             'separator': ['-', 'Word separator. Defaults to "-".']
         }
 
-        super(TocExtension, self).__init__(*args, **kwargs)
+        super(TocExtension, self).__init__(**kwargs)
 
     def extendMarkdown(self, md, md_globals):
         md.registerExtension(self)
@@ -303,5 +303,5 @@ class TocExtension(Extension):
         self.md.toc = ''
 
 
-def makeExtension(*args, **kwargs):
-    return TocExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return TocExtension(**kwargs)
diff --git a/markdown/extensions/wikilinks.py b/markdown/extensions/wikilinks.py
index 94e1b67..6ae9483 100644
--- a/markdown/extensions/wikilinks.py
+++ b/markdown/extensions/wikilinks.py
@@ -31,7 +31,7 @@ def build_url(label, base, end):
 
 class WikiLinkExtension(Extension):
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.config = {
             'base_url': ['/', 'String to append to beginning or URL.'],
             'end_url': ['/', 'String to append to end of URL.'],
@@ -39,7 +39,7 @@ class WikiLinkExtension(Extension):
             'build_url': [build_url, 'Callable formats URL from label.'],
         }
 
-        super(WikiLinkExtension, self).__init__(*args, **kwargs)
+        super(WikiLinkExtension, self).__init__(**kwargs)
 
     def extendMarkdown(self, md, md_globals):
         self.md = md
@@ -85,5 +85,5 @@ class WikiLinks(Pattern):
         return base_url, end_url, html_class
 
 
-def makeExtension(*args, **kwargs):
-    return WikiLinkExtension(*args, **kwargs)
+def makeExtension(**kwargs):
+    return WikiLinkExtension(**kwargs)