Cleaned up all imports using isort.

dpaste/forms.py

@@ -4,8 +4,8 @@ from django import forms
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from dpaste.models import Snippet
+from .highlight import LEXER_DEFAULT, LEXER_KEYS, LEXER_LIST
-from dpaste.highlight import LEXER_LIST, LEXER_DEFAULT, LEXER_KEYS
+from .models import Snippet
 
 EXPIRE_CHOICES = getattr(settings, 'DPASTE_EXPIRE_CHOICES', (
     ('onetime', _(u'One-Time snippet')),

dpaste/highlight.py

@@ -1,10 +1,9 @@
-from pygments import highlight
-from pygments.lexers import *
-from pygments.formatters import HtmlFormatter
-
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
 from django.template.defaultfilters import escape
+from django.utils.translation import ugettext_lazy as _
+from pygments import highlight
+from pygments.formatters import HtmlFormatter
+from pygments.lexers import *
 
 """
 # Get a list of all lexer, and then remove all lexer which have '-' or '+'

dpaste/management/commands/cleanup_snippets.py

@@ -1,9 +1,12 @@
 import sys
 from optparse import make_option
+
 from django.core.management.base import LabelCommand
 from django.utils import timezone
+
 from dpaste.models import Snippet
 
+
 class Command(LabelCommand):
     option_list = LabelCommand.option_list + (
         make_option('--dry-run', '-d', action='store_true', dest='dry_run',

dpaste/middleware.py

@@ -1,4 +1,5 @@
 import socket
+
 from django.http import HttpResponseBadRequest
 
 tor_bl = (

dpaste/migrations/0001_initial.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

dpaste/migrations/0002_auto__del_spamword__del_field_snippet_author__del_field_snippet_title.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

dpaste/migrations/0003_auto__del_field_snippet_content_highlighted.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

dpaste/migrations/0004_auto__chg_field_snippet_expires__chg_field_snippet_secret_id__chg_fiel.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

dpaste/migrations/0005_auto__add_field_snippet_expire_type__add_field_snippet_view_count.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

dpaste/migrations/0006_auto__add_unique_snippet_secret_id.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

dpaste/models.py

@@ -1,13 +1,12 @@
 from random import SystemRandom
 
-from django.db import IntegrityError
-from django.db import models
-from django.core.urlresolvers import reverse
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
 import mptt
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
 
-from dpaste.highlight import LEXER_DEFAULT
+from .highlight import LEXER_DEFAULT
 
 R = SystemRandom()
 ONETIME_LIMIT = getattr(settings, 'DPASTE_ONETIME_LIMIT', 2)

dpaste/settings/local.py.example

@@ -1,4 +1,4 @@
-from dpaste.settings import *
+from .settings import *
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG

dpaste/templatetags/dpaste_tags.py

@@ -1,5 +1,6 @@
 from django.template import Library
-from dpaste.highlight import pygmentize
+
+from ..highlight import pygmentize
 
 register = Library()
 

dpaste/tests/test_api.py

@@ -1,11 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 from django.core.urlresolvers import reverse
-from django.test.client import Client
 from django.test import TestCase
+from django.test.client import Client
 
-from ..models import Snippet
 from ..highlight import PLAIN_CODE
+from ..models import Snippet
+
 
 class SnippetAPITestCase(TestCase):
 

dpaste/tests/test_snippet.py

@@ -4,13 +4,13 @@ from datetime import timedelta
 
 from django.core import management
 from django.core.urlresolvers import reverse
-from django.test.client import Client
 from django.test import TestCase
+from django.test.client import Client
 from django.test.utils import override_settings
 
-from ..models import Snippet
 from ..forms import EXPIRE_DEFAULT
-from ..highlight import LEXER_DEFAULT, PLAIN_TEXT, PLAIN_CODE
+from ..highlight import LEXER_DEFAULT, PLAIN_CODE, PLAIN_TEXT
+from ..models import Snippet
 
 
 class SnippetTestCase(TestCase):
@@ -377,7 +377,7 @@ class SnippetTestCase(TestCase):
     def test_highlighting(self):
         # You can pass any lexer to the pygmentize function and it will
         # never fail loudly.
-        from dpaste.highlight import pygmentize
+        from ..highlight import pygmentize
         pygmentize('code', lexer_name='python')
         pygmentize('code', lexer_name='doesnotexist')
 

dpaste/urls/dpaste.py

@@ -1,5 +1,5 @@
-from django.conf.urls import url, patterns
 from django.conf import settings
+from django.conf.urls import patterns, url
 
 L = getattr(settings, 'DPASTE_SLUG_LENGTH', 4)
 

dpaste/urls/dpaste_api.py

@@ -1,4 +1,5 @@
-from django.conf.urls import url, patterns
+from django.conf.urls import patterns, url
+
 from ..views import snippet_api
 
 urlpatterns = patterns('',

dpaste/views.py

@@ -1,28 +1,27 @@
 import datetime
 import difflib
-import requests
 import json
 
-from django.shortcuts import (render_to_response, get_object_or_404)
+import requests
-from django.template.context import RequestContext
-from django.http import (Http404, HttpResponseRedirect, HttpResponseBadRequest,
-    HttpResponse)
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.db.models import Count
-from django.views.defaults import (page_not_found as django_page_not_found,
+from django.http import (Http404, HttpResponse, HttpResponseBadRequest,
-    server_error as django_server_error)
+                         HttpResponseRedirect)
+from django.shortcuts import get_object_or_404, render_to_response
+from django.template.context import RequestContext
+from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
-
+from django.views.defaults import page_not_found as django_page_not_found
+from django.views.defaults import server_error as django_server_error
 from pygments.lexers import get_lexer_for_filename
 from pygments.util import ClassNotFound
 
-from dpaste.forms import SnippetForm, get_expire_values, EXPIRE_CHOICES
+from .forms import EXPIRE_CHOICES, get_expire_values, SnippetForm
-from dpaste.models import Snippet, ONETIME_LIMIT
+from .highlight import (LEXER_DEFAULT, LEXER_KEYS, LEXER_LIST,
-from dpaste.highlight import (LEXER_DEFAULT, LEXER_KEYS, LEXER_WORDWRAP,
+                              LEXER_WORDWRAP, PLAIN_CODE)
-    LEXER_LIST, PLAIN_CODE)
+from .models import ONETIME_LIMIT, Snippet
 
 template_globals = {
     'site_name': getattr(settings, 'DPASTE_SITE_NAME', 'dpaste.de'),

runtests.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import sys
+
 from django.conf import settings
 
 if not settings.configured:

setup.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python
-from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
 from sys import exit
 
+from setuptools import find_packages, setup
+from setuptools.command.test import test as TestCommand
+
+
 class Tox(TestCommand):
     def finalize_options(self):
         TestCommand.finalize_options(self)