Merge branch 'master' into partials-update

Conflicts:
	realms/modules/wiki/views.py

realms/modules/wiki/__init__.py

@@ -1,6 +1,9 @@
+from __future__ import absolute_import
+
 import os
 import sys
-from realms.modules.wiki.models import Wiki
+
+from .models import Wiki
 
 
 def init(app):

realms/modules/wiki/assets.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from realms import assets
 
 assets.register('editor.js',

realms/modules/wiki/hooks.py

@@ -1,4 +1,7 @@
+from __future__ import absolute_import
+
 from flask import g, current_app
+
 from .models import Wiki
 
 

realms/modules/wiki/models.py

@@ -1,13 +1,17 @@
+from __future__ import absolute_import
+
 import os
 import posixpath
 import re
+
 import ghdiff
 import yaml
 from dulwich.object_store import tree_lookup_path
 from dulwich.repo import Repo, NotGitRepository
-from realms.lib.util import cname_to_filename, filename_to_cname
+
 from realms import cache
 from realms.lib.hook import HookMixin
+from realms.lib.util import cname_to_filename, filename_to_cname
 
 
 class PageNotFound(Exception):

realms/modules/wiki/tests.py

@@ -1,6 +1,10 @@
+from __future__ import absolute_import
+
 import json
+
 from nose.tools import *
 from flask import url_for
+
 from realms.lib.util import cname_to_filename, filename_to_cname
 from realms.lib.test import BaseTest
 

realms/modules/wiki/views.py

@@ -1,12 +1,17 @@
+from __future__ import absolute_import
+
 import collections
 import itertools
 import sys
 from datetime import datetime
+
 from flask import abort, g, render_template, request, redirect, Blueprint, flash, url_for, current_app
 from flask_login import login_required, current_user
+
 from realms.lib.util import to_canonical, remove_ext, gravatar_url
 from .models import PageNotFound
 
+
 blueprint = Blueprint('wiki', __name__, template_folder='templates',
                       static_folder='static', static_url_path='/static/wiki')