Skip to content

D
django-wiki
Commit 45499415 by benjaoming
Options

use python-modernizer to fix migrations and other small issues

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