Remove mkdocs.compat and add six

Fixes mkdocs#447

Author: d0ugal

mkdocs/build.py

@@ -7,7 +7,7 @@
 import os
 
 from jinja2.exceptions import TemplateNotFound
-from mkdocs.compat import urljoin
+from six.moves.urllib.parse import urljoin
 import jinja2
 import json
 import markdown

mkdocs/compat.py

@@ -6,9 +6,9 @@
 import os
 
 import yaml
+from six.moves.urllib.parse import urlparse
 
 from mkdocs import utils
-from mkdocs.compat import urlparse
 from mkdocs.exceptions import ConfigurationError
 
 log = logging.getLogger(__name__)

mkdocs/config.py

@@ -39,9 +39,9 @@
 
 from markdown.extensions import Extension
 from markdown.treeprocessors import Treeprocessor
+from six.moves.urllib.parse import urlparse, urlunparse
 
 from mkdocs import utils
-from mkdocs.compat import urlparse, urlunparse
 from mkdocs.exceptions import MarkdownNotFound
 
 log = logging.getLogger(__name__)

mkdocs/relative_path_ext.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mkdocs.compat import unicode as text_type
-from mkdocs import compat as html_parser
+from six import text_type
+from six.moves import html_parser
 import json
 
 

mkdocs/search.py

@@ -6,8 +6,9 @@
 import tempfile
 import unittest
 
+from six.moves import zip
+
 from mkdocs import build, nav, config
-from mkdocs.compat import zip
 from mkdocs.exceptions import MarkdownNotFound
 from mkdocs.tests.base import dedent
 

mkdocs/tests/build_tests.py

@@ -6,8 +6,10 @@
 import tempfile
 import unittest
 
+from six import PY2
+from six.moves import zip
+
 from mkdocs import config
-from mkdocs.compat import PY2, zip
 from mkdocs.exceptions import ConfigurationError
 from mkdocs.tests.base import dedent
 

mkdocs/tests/config_tests.py

@@ -80,9 +80,13 @@ def build(theme_name, output=None, config=None, quiet=False):
         if not quiet:
             print("Building {0}".format(theme_name))
 
-        with capture() as out:
-            mkdocs_main.main('build', None, options)
-            mkdocs_main.main('json', None, options)
+        try:
+            with capture() as out:
+                mkdocs_main.main('build', None, options)
+                mkdocs_main.main('json', None, options)
+        except Exception:
+            print("Failed when building {0}".format(theme_name), file=sys.stderr)
+            raise
 
         if not quiet:
             print(''.join(out))

mkdocs/tests/integration.py

@@ -14,7 +14,7 @@
 * Parse table of contents HTML into the underlying data structure.
 """
 
-from mkdocs.compat import HTMLParser
+from six.moves.html_parser import HTMLParser
 
 
 class TableOfContents(object):

mkdocs/toc.py

@@ -10,7 +10,8 @@
 import os
 import shutil
 
-from mkdocs.compat import urlparse, pathname2url
+from six.moves.urllib.parse import urlparse
+from six.moves.urllib.request import pathname2url
 
 
 def copy_file(source_path, output_path):

mkdocs/utils.py

@@ -3,3 +3,4 @@ Jinja2>=2.7.1
 livereload>=2.3.2
 Markdown>=2.5
 PyYAML>=3.10
+six>=1.9.0

requirements/project.txt

@@ -78,6 +78,7 @@ def get_package_data(package):
         'livereload>=2.3.2',
         'Markdown>=2.3.1,<2.5' if PY26 else 'Markdown>=2.3.1',
         'PyYAML>=3.10',
+        'six>=1.9.0',
     ],
     entry_points={
         'console_scripts': [