Commit 45499415 by benjaoming

use python-modernizer to fix migrations and other small issues

parent 43ce2812
...@@ -30,6 +30,7 @@ Options: ...@@ -30,6 +30,7 @@ Options:
""" """
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from docopt import docopt from docopt import docopt
import os import os
import re import re
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
from __future__ import absolute_import
# #
# django-wiki documentation build configuration file, created by # django-wiki documentation build configuration file, created by
# sphinx-quickstart on Mon Jul 23 16:13:51 2012. # sphinx-quickstart on Mon Jul 23 16:13:51 2012.
......
from __future__ import absolute_import
from __future__ import unicode_literals
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
import django import django
......
from __future__ import absolute_import
from __future__ import unicode_literals
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
......
from __future__ import absolute_import
from __future__ import unicode_literals
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import sys import sys
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from os import path as os_path from os import path as os_path
PROJECT_PATH = os_path.abspath(os_path.split(os_path.dirname(__file__))[0]) PROJECT_PATH = os_path.abspath(os_path.split(os_path.dirname(__file__))[0])
......
from __future__ import absolute_import
from __future__ import unicode_literals
from testproject.settings import * from testproject.settings import *
from testproject.settings.local import * from testproject.settings.local import *
......
from __future__ import absolute_import
from __future__ import unicode_literals
from testproject.settings import * from testproject.settings import *
from testproject.settings.local import * from testproject.settings.local import *
......
from __future__ import absolute_import
from __future__ import unicode_literals
from testproject.settings import * from testproject.settings import *
from testproject.settings.local import * from testproject.settings.local import *
import os import os
......
from __future__ import absolute_import
from __future__ import unicode_literals
from testproject.settings import * from testproject.settings import *
from testproject.settings.local import * from testproject.settings.local import *
......
from __future__ import absolute_import
from __future__ import unicode_literals
from testproject.settings import * from testproject.settings import *
SECRET_KEY = 'b^fv_)t39h%9p40)fnkfblo##jkr!$0)lkp6bpy!fi*f$4*92!' SECRET_KEY = 'b^fv_)t39h%9p40)fnkfblo##jkr!$0)lkp6bpy!fi*f$4*92!'
from __future__ import absolute_import
from __future__ import unicode_literals
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.conf import settings from django.conf import settings
from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib.staticfiles.urls import staticfiles_urlpatterns
......
...@@ -13,6 +13,8 @@ middleware here, or combine a Django application with an application of another ...@@ -13,6 +13,8 @@ middleware here, or combine a Django application with an application of another
framework. framework.
""" """
from __future__ import absolute_import
from __future__ import unicode_literals
import os import os
import sys import sys
......
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# This package and all its sub-packages are part of django-wiki, # This package and all its sub-packages are part of django-wiki,
# except where otherwise stated. # except where otherwise stated.
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.contrib import admin from django.contrib import admin
from django.contrib.contenttypes.generic import GenericTabularInline from django.contrib.contenttypes.generic import GenericTabularInline
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django.apps import AppConfig from django.apps import AppConfig
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf import settings as django_settings from django.conf import settings as django_settings
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
import markdown import markdown
......
"""Abstraction layer to deal with Django related changes in order to keep """Abstraction layer to deal with Django related changes in order to keep
compatibility with several Django versions simultaneously.""" compatibility with several Django versions simultaneously."""
from __future__ import absolute_import
from __future__ import unicode_literals
from django import VERSION as DJANGO_VERSION from django import VERSION as DJANGO_VERSION
from django.db import transaction from django.db import transaction
from django.conf import settings as django_settings from django.conf import settings as django_settings
......
from __future__ import absolute_import
from __future__ import unicode_literals
import difflib import difflib
def simple_merge(txt1, txt2): def simple_merge(txt1, txt2):
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
import os import os
import mimetypes import mimetypes
from datetime import datetime from datetime import datetime
......
from __future__ import absolute_import
from __future__ import unicode_literals
from wiki.conf import settings from wiki.conf import settings
############################### ###############################
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
"""Base classes for different plugin objects. """Base classes for different plugin objects.
......
...@@ -6,6 +6,8 @@ https://github.com/ojii/django-load. ...@@ -6,6 +6,8 @@ https://github.com/ojii/django-load.
Thanks for the technique! Thanks for the technique!
""" """
from __future__ import print_function from __future__ import print_function
from __future__ import absolute_import
from __future__ import unicode_literals
from django.conf import settings from django.conf import settings
from django.utils.importlib import import_module from django.utils.importlib import import_module
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.utils.importlib import import_module from django.utils.importlib import import_module
from six import string_types from six import string_types
...@@ -13,7 +15,7 @@ def register(PluginClass): ...@@ -13,7 +15,7 @@ def register(PluginClass):
Register a plugin class. This function will call back your plugin's Register a plugin class. This function will call back your plugin's
constructor. constructor.
""" """
if PluginClass in _cache.keys(): if PluginClass in list(_cache.keys()):
raise Exception("Plugin class already registered") raise Exception("Plugin class already registered")
plugin = PluginClass() plugin = PluginClass()
_cache[PluginClass] = plugin _cache[PluginClass] = plugin
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.utils.importlib import import_module from django.utils.importlib import import_module
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import HttpResponse, HttpResponseNotFound, \ from django.http import HttpResponse, HttpResponseNotFound, \
HttpResponseForbidden, HttpResponseRedirect HttpResponseForbidden, HttpResponseRedirect
...@@ -13,6 +14,7 @@ from wiki.core.exceptions import NoRootURL ...@@ -13,6 +14,7 @@ from wiki.core.exceptions import NoRootURL
from wiki.conf import settings from wiki.conf import settings
from django.utils.http import urlquote from django.utils.http import urlquote
from six.moves import filter
def json_view(func): def json_view(func):
def wrap(request, *args, **kwargs): def wrap(request, *args, **kwargs):
......
from __future__ import absolute_import
from wiki.conf import settings from wiki.conf import settings
from django.core.urlresolvers import get_callable from django.core.urlresolvers import get_callable
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django import forms from django import forms
class BaseEditor(): class BaseEditor():
......
# -*- coding: utf-8 # -*- coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django import forms from django import forms
from django.forms.util import flatatt from django.forms.util import flatatt
try: try:
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
import random import random
import string import string
...@@ -10,6 +11,7 @@ from django import forms ...@@ -10,6 +11,7 @@ from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.forms.util import flatatt from django.forms.util import flatatt
from six.moves import range
try: try:
from django.utils.encoding import force_unicode from django.utils.encoding import force_unicode
except ImportError: except ImportError:
...@@ -135,7 +137,7 @@ class EditForm(forms.Form, SpamProtectionMixin): ...@@ -135,7 +137,7 @@ class EditForm(forms.Form, SpamProtectionMixin):
self.presumed_revision = data.get('current_revision', None) self.presumed_revision = data.get('current_revision', None)
if not str(self.presumed_revision) == str(self.initial_revision.id): if not str(self.presumed_revision) == str(self.initial_revision.id):
newdata = {} newdata = {}
for k,v in data.items(): for k,v in list(data.items()):
newdata[k] = v newdata[k] = v
newdata['current_revision'] = self.initial_revision.id newdata['current_revision'] = self.initial_revision.id
newdata['content'] = simple_merge(self.initial_revision.content, newdata['content'] = simple_merge(self.initial_revision.content,
......
...@@ -45,6 +45,7 @@ options: ...@@ -45,6 +45,7 @@ options:
show inheritance arrows. show inheritance arrows.
""" """
from __future__ import print_function from __future__ import print_function
from __future__ import absolute_import
__version__ = "0.99" __version__ = "0.99"
__svnid__ = "$Id$" __svnid__ = "$Id$"
__license__ = "Python" __license__ = "Python"
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import Q
from django.db.models.query import QuerySet, EmptyQuerySet from django.db.models.query import QuerySet, EmptyQuerySet
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django import VERSION from django import VERSION
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import generic from django.contrib.contenttypes import generic
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
...@@ -142,7 +143,7 @@ class Article(models.Model): ...@@ -142,7 +143,7 @@ class Article(models.Model):
if self.current_revision: if self.current_revision:
return self.current_revision.title return self.current_revision.title
obj_name = _('Article without content (%(id)d)') % {'id': self.id} obj_name = _('Article without content (%(id)d)') % {'id': self.id}
return unicode(obj_name) return str(obj_name)
class Meta: class Meta:
app_label = settings.APP_LABEL app_label = settings.APP_LABEL
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.db.models import signals from django.db.models import signals
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import print_function from __future__ import print_function
from __future__ import absolute_import
import logging import logging
......
from __future__ import unicode_literals
default_app_config = 'wiki.apps.AttachmentsConfig' default_app_config = 'wiki.apps.AttachmentsConfig'
\ No newline at end of file
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.contrib import admin from django.contrib import admin
from . import models from . import models
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
...@@ -87,7 +88,7 @@ class AttachmentArchiveForm(AttachmentForm): ...@@ -87,7 +88,7 @@ class AttachmentArchiveForm(AttachmentForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(AttachmentArchiveForm, self).__init__(*args, **kwargs) super(AttachmentArchiveForm, self).__init__(*args, **kwargs)
ordered_fields = ['unzip_archive', 'file'] ordered_fields = ['unzip_archive', 'file']
self.fields.keyOrder = ordered_fields + [k for k in self.fields.keys() if k not in ordered_fields] self.fields.keyOrder = ordered_fields + [k for k in list(self.fields.keys()) if k not in ordered_fields]
def clean_file(self): def clean_file(self):
uploaded_file = self.cleaned_data.get('file', None) uploaded_file = self.cleaned_data.get('file', None)
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
import markdown import markdown
import re import re
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
from __future__ import absolute_import
import os.path import os.path
from django.db import models from django.db import models
...@@ -14,6 +15,7 @@ from wiki.models.article import BaseRevisionMixin ...@@ -14,6 +15,7 @@ from wiki.models.article import BaseRevisionMixin
from django.db.models import signals from django.db.models import signals
from six.moves import map from six.moves import map
from six.moves import zip from six.moves import zip
from six.moves import range
class IllegalFileExtension(Exception): class IllegalFileExtension(Exception):
"""File extension on upload is not allowed""" """File extension on upload is not allowed"""
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django import VERSION from django import VERSION
from django.conf import settings as django_settings from django.conf import settings as django_settings
from wiki.conf import settings as wiki_settings from wiki.conf import settings as wiki_settings
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
from wiki.plugins.attachments import views from wiki.plugins.attachments import views
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.contrib import messages from django.contrib import messages
from django.db.models import Q from django.db.models import Q
from django.http import Http404, HttpResponseRedirect from django.http import Http404, HttpResponseRedirect
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.conf.urls import patterns, url, include from django.conf.urls import patterns, url, include
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
from __future__ import absolute_import
from __future__ import unicode_literals
from wiki.core import settings from wiki.core import settings
from wiki.core import permissions from wiki.core import permissions
from wiki import models from wiki import models
......
from __future__ import absolute_import
from __future__ import unicode_literals
from haystack import indexes from haystack import indexes
from wiki import models from wiki import models
......
from __future__ import absolute_import
from __future__ import unicode_literals
from wiki.views.article import SearchView from wiki.views.article import SearchView
from haystack.query import SearchQuerySet from haystack.query import SearchQuerySet
from haystack.inputs import AutoQuery from haystack.inputs import AutoQuery
......
from __future__ import absolute_import
from django.db import models from django.db import models
# Create your models here. # Create your models here.
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
from __future__ import unicode_literals
default_app_config = 'wiki.apps.ImagesConfig' default_app_config = 'wiki.apps.ImagesConfig'
\ No newline at end of file
from __future__ import absolute_import
from __future__ import unicode_literals
from django.contrib import admin from django.contrib import admin
from django import forms from django import forms
from . import models from . import models
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import markdown import markdown
import re import re
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
import os.path import os.path
from django.conf import settings as django_settings from django.conf import settings as django_settings
...@@ -10,6 +11,7 @@ from . import settings ...@@ -10,6 +11,7 @@ from . import settings
from wiki.models.pluginbase import RevisionPlugin, RevisionPluginRevision from wiki.models.pluginbase import RevisionPlugin, RevisionPluginRevision
from django.db.models import signals from django.db.models import signals
from six.moves import range
if not "sorl.thumbnail" in django_settings.INSTALLED_APPS: if not "sorl.thumbnail" in django_settings.INSTALLED_APPS:
raise ImproperlyConfigured('wiki.plugins.images: needs sorl.thumbnail in INSTALLED_APPS') raise ImproperlyConfigured('wiki.plugins.images: needs sorl.thumbnail in INSTALLED_APPS')
...@@ -45,7 +47,7 @@ class Image(RevisionPlugin): ...@@ -45,7 +47,7 @@ class Image(RevisionPlugin):
def __unicode__(self): def __unicode__(self):
title = (_('Image: %s') % self.current_revision.imagerevision.get_filename()) if self.current_revision else _('Current revision not set!!') title = (_('Image: %s') % self.current_revision.imagerevision.get_filename()) if self.current_revision else _('Current revision not set!!')
return unicode(title) return str(title)
class ImageRevision(RevisionPluginRevision): class ImageRevision(RevisionPluginRevision):
...@@ -100,7 +102,7 @@ class ImageRevision(RevisionPluginRevision): ...@@ -100,7 +102,7 @@ class ImageRevision(RevisionPluginRevision):
def __unicode__(self): def __unicode__(self):
title = _('Image Revsion: %d') % self.revision_number title = _('Image Revsion: %d') % self.revision_number
return unicode(title) return str(title)
def on_image_revision_delete(instance, *args, **kwargs): def on_image_revision_delete(instance, *args, **kwargs):
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django import VERSION from django import VERSION
from django.conf import settings as django_settings from django.conf import settings as django_settings
from wiki.conf import settings as wiki_settings from wiki.conf import settings as wiki_settings
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django import template from django import template
from wiki.plugins.images import models from wiki.plugins.images import models
......
from __future__ import absolute_import
from sorl.thumbnail.templatetags.thumbnail import register from sorl.thumbnail.templatetags.thumbnail import register
from __future__ import absolute_import
from __future__ import unicode_literals
from django.contrib import messages from django.contrib import messages
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
...@@ -19,6 +19,8 @@ Dependencies: ...@@ -19,6 +19,8 @@ Dependencies:
* [Python 2.3+](http://python.org) * [Python 2.3+](http://python.org)
* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/) * [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
''' '''
from __future__ import absolute_import
from __future__ import unicode_literals
import markdown import markdown
......
...@@ -40,6 +40,7 @@ Negative examples: ...@@ -40,6 +40,7 @@ Negative examples:
'<p>del.icio.us</p>' '<p>del.icio.us</p>'
""" """
from __future__ import absolute_import
import markdown import markdown
import re import re
......
from __future__ import absolute_import
from django.db import models from django.db import models
# Create your models here. # Create your models here.
from __future__ import absolute_import
from __future__ import unicode_literals
from django.conf import settings as django_settings from django.conf import settings as django_settings
LOOKUP_LEVEL = getattr(django_settings, 'WIKI_LINKS_LOOKUP_LEVEL', 2) LOOKUP_LEVEL = getattr(django_settings, 'WIKI_LINKS_LOOKUP_LEVEL', 2)
from __future__ import absolute_import
from __future__ import unicode_literals
from wiki.decorators import json_view, get_article from wiki.decorators import json_view, get_article
from django.views.generic.base import View from django.views.generic.base import View
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
import markdown import markdown
import re import re
from six import string_types from six import string_types
......
...@@ -15,6 +15,8 @@ Until it's released, we have a copy here. ...@@ -15,6 +15,8 @@ Until it's released, we have a copy here.
/benjaoming /benjaoming
""" """
from __future__ import absolute_import
from __future__ import unicode_literals
import markdown import markdown
from markdown.util import etree from markdown.util import etree
from markdown.extensions.headerid import slugify, itertext from markdown.extensions.headerid import slugify, itertext
...@@ -22,6 +24,7 @@ from markdown.extensions.headerid import slugify, itertext ...@@ -22,6 +24,7 @@ from markdown.extensions.headerid import slugify, itertext
import re import re
from wiki.plugins.macros import settings from wiki.plugins.macros import settings
from six.moves import range
IDCOUNT_RE = re.compile(r'^(.*)_([0-9]+)$') IDCOUNT_RE = re.compile(r'^(.*)_([0-9]+)$')
def unique(elem_id, ids): def unique(elem_id, ids):
...@@ -53,7 +56,7 @@ def order_toc_list(toc_list): ...@@ -53,7 +56,7 @@ def order_toc_list(toc_list):
return [], [] return [], []
current = remaining_list.pop(0) current = remaining_list.pop(0)
if not 'children' in current.keys(): if not 'children' in list(current.keys()):
current['children'] = [] current['children'] = []
if not prev_elements: if not prev_elements:
...@@ -194,7 +197,7 @@ class TocTreeprocessor(markdown.treeprocessors.Treeprocessor): ...@@ -194,7 +197,7 @@ class TocTreeprocessor(markdown.treeprocessors.Treeprocessor):
prettify = self.markdown.treeprocessors.get('prettify') prettify = self.markdown.treeprocessors.get('prettify')
if prettify: prettify.run(div) if prettify: prettify.run(div)
toc = self.markdown.serializer(div) toc = self.markdown.serializer(div)
for pp in self.markdown.postprocessors.values(): for pp in list(self.markdown.postprocessors.values()):
toc = pp.run(toc) toc = pp.run(toc)
self.markdown.toc = toc self.markdown.toc = toc
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
""" """
Extend the shipped Markdown extension 'wikilinks' Extend the shipped Markdown extension 'wikilinks'
""" """
from __future__ import absolute_import
from __future__ import unicode_literals
from markdown.extensions import wikilinks from markdown.extensions import wikilinks
import markdown import markdown
import re import re
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf import settings as django_settings from django.conf import settings as django_settings
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django import template from django import template
from wiki.plugins.macros import settings from wiki.plugins.macros import settings
from wiki.plugins.macros.mdx.macro import MacroPreprocessor from wiki.plugins.macros.mdx.macro import MacroPreprocessor
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
from __future__ import print_function from __future__ import print_function
from __future__ import absolute_import
from __future__ import unicode_literals
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
import getpass import getpass
...@@ -14,10 +16,11 @@ import string ...@@ -14,10 +16,11 @@ import string
from django.template.defaultfilters import slugify from django.template.defaultfilters import slugify
from django.template.defaultfilters import striptags from django.template.defaultfilters import striptags
import urllib import urllib
import six
def only_printable(s): def only_printable(s):
return filter(lambda x: x in string.printable, s) return [x for x in s if x in string.printable]
class Command(BaseCommand): class Command(BaseCommand):
...@@ -152,7 +155,7 @@ class Command(BaseCommand): ...@@ -152,7 +155,7 @@ class Command(BaseCommand):
# TODO: nsquare is bad # TODO: nsquare is bad
for (article, article_revision) in self.articles_imported: for (article, article_revision) in self.articles_imported:
print("Updating links of %s" % (article_revision.title, )) print("Updating links of %s" % (article_revision.title, ))
for id_from, id_to in self.matching_old_link_new_link.iteritems(): for id_from, id_to in six.iteritems(self.matching_old_link_new_link):
print("Replacing (%s \"wikilink\") with (%s)" % (id_from, id_to)) print("Replacing (%s \"wikilink\") with (%s)" % (id_from, id_to))
article_revision.content = article_revision.content.replace("(%s \"wikilink\")" % (id_from, ), "(%s)" % (id_to,)) article_revision.content = article_revision.content.replace("(%s \"wikilink\")" % (id_from, ), "(%s)" % (id_to,))
......
from __future__ import unicode_literals
default_app_config = 'wiki.apps.NotifcationsConfig' default_app_config = 'wiki.apps.NotifcationsConfig'
\ No newline at end of file
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django import forms from django import forms
from django.forms.models import modelformset_factory, BaseModelFormSet from django.forms.models import modelformset_factory, BaseModelFormSet
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.db.models import signals from django.db.models import signals
...@@ -24,7 +25,7 @@ class ArticleSubscription(ArticlePlugin): ...@@ -24,7 +25,7 @@ class ArticleSubscription(ArticlePlugin):
{'user': self.settings.user.username, {'user': self.settings.user.username,
'article': self.article.current_revision.title, 'article': self.article.current_revision.title,
'type': self.notification_type.label}) 'type': self.notification_type.label})
return unicode(title) return str(title)
class Meta: class Meta:
unique_together = ('subscription', 'articleplugin_ptr') unique_together = ('subscription', 'articleplugin_ptr')
......
from __future__ import absolute_import
from __future__ import unicode_literals
from django import VERSION from django import VERSION
# This is deprecated in django 1.7+ # This is deprecated in django 1.7+
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
def get_title(article): def get_title(article):
......
# Create your views here. # Create your views here.
from __future__ import unicode_literals from __future__ import unicode_literals
from __future__ import absolute_import
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.shortcuts import redirect from django.shortcuts import redirect
......
from __future__ import absolute_import
from __future__ import unicode_literals
from wiki.core.plugins import registry from wiki.core.plugins import registry
from wiki.core.plugins.base import BasePlugin from wiki.core.plugins.base import BasePlugin
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
from __future__ import absolute_import
from __future__ import unicode_literals
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime import datetime
from south.db import db from south.db import db
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment