Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 82 insertions, 0 deletions

diff --git a/mkdocs.py b/mkdocs.py
new file mode 100755
index 00000000..3f6c5f65
--- /dev/null
+++ b/mkdocs.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+
+import markdown
+import os
+import re
+import shutil
+import sys
+
+root_dir = os.path.abspath(os.path.dirname(__file__))
+docs_dir = os.path.join(root_dir, 'docs')
+html_dir = os.path.join(root_dir, 'html')
+
+local = not '--deploy' in sys.argv
+
+if local:
+    base_url = 'file://%s/' % os.path.normpath(os.path.join(os.getcwd(), html_dir))
+    suffix = '.html'
+    index = 'index.html'
+else:
+    base_url = 'http://django-rest-framework.org'
+    suffix = ''
+    index = ''
+
+
+main_header = '<li class="main"><a href="#{{ anchor }}">{{ title }}</a></li>'
+sub_header = '<li><a href="#{{ anchor }}">{{ title }}</a></li>'
+code_label = r'<a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/\1"><span class="label label-info">\1</span></a>'
+
+page = open(os.path.join(docs_dir, 'template.html'), 'r').read()
+
+# Copy static files
+# for static in ['css', 'js', 'img']:
+#     source = os.path.join(docs_dir, 'static', static)
+#     target = os.path.join(html_dir, static)
+#     if os.path.exists(target):
+#         shutil.rmtree(target)
+#     shutil.copytree(source, target)
+
+for (dirpath, dirnames, filenames) in os.walk(docs_dir):
+    relative_dir = dirpath.replace(docs_dir, '').lstrip(os.path.sep)
+    build_dir = os.path.join(html_dir, relative_dir)
+
+    if not os.path.exists(build_dir):
+        os.makedirs(build_dir)
+
+    for filename in filenames:
+        path = os.path.join(dirpath, filename)
+
+        if not filename.endswith('.md'):
+            if relative_dir:
+                output_path = os.path.join(build_dir, filename)
+                shutil.copy(path, output_path)
+            continue
+
+        output_path = os.path.join(build_dir, filename[:-3] + '.html')
+
+        toc = ''
+        text = open(path, 'r').read().decode('utf-8')
+        for line in text.splitlines():
+            if line.startswith('# '):
+                title = line[2:].strip()
+                template = main_header
+            elif line.startswith('## '):
+                title = line[3:].strip()
+                template = sub_header
+            else:
+                continue
+
+            anchor = title.lower().replace(' ', '-').replace(':-', '-').replace("'", '').replace('?', '').replace('.', '')
+            template = template.replace('{{ title }}', title)
+            template = template.replace('{{ anchor }}', anchor)
+            toc += template + '\n'
+
+        content = markdown.markdown(text, ['headerid'])
+
+        output = page.replace('{{ content }}', content).replace('{{ toc }}', toc).replace('{{ base_url }}', base_url).replace('{{ suffix }}', suffix).replace('{{ index }}', index)
+        output = output.replace('{{ page_id }}', filename[:-3])
+        output = re.sub(r'a href="([^"]*)\.md"', r'a href="\1%s"' % suffix, output)
+        output = re.sub(r'<pre><code>:::bash', r'<pre class="prettyprint lang-bsh">', output)
+        output = re.sub(r'<pre>', r'<pre class="prettyprint lang-py">', output)
+        output = re.sub(r'<a class="github" href="([^"]*)"></a>', code_label, output)
+        open(output_path, 'w').write(output.encode('utf-8'))