Skip to content

Commit

Permalink
Fix imports order
Browse files Browse the repository at this point in the history
  • Loading branch information
Fantomas42 committed Mar 6, 2017
1 parent 54775ba commit 49444aa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions app_namespace/loader.py
@@ -1,13 +1,11 @@
"""Template loader for app-namespace"""
import os
import io
import errno
import io
import os
from collections import OrderedDict

import django
from django.apps import apps
from django.utils._os import upath
from django.utils._os import safe_join
try:
from django.template import Origin
except ImportError: # pragma: no cover
Expand All @@ -16,8 +14,10 @@ def __init__(self, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)
from django.template import TemplateDoesNotExist
from django.utils.functional import cached_property
from django.template.loaders.base import Loader as BaseLoader
from django.utils._os import safe_join
from django.utils._os import upath
from django.utils.functional import cached_property


class NamespaceOrigin(Origin):
Expand Down
12 changes: 6 additions & 6 deletions app_namespace/tests/tests.py
@@ -1,21 +1,21 @@
"""Tests for app_namespace"""
import os
import sys
import shutil
import sys
import tempfile

from app_namespace import Loader

import django
from django.test import TestCase
from django.core.urlresolvers import reverse
from django.template import TemplateDoesNotExist
from django.template.base import Context
from django.template.base import Template
from django.template.engine import Engine
from django.template import TemplateDoesNotExist
from django.template.loaders import app_directories
from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test.utils import override_settings

from app_namespace import Loader


class LoaderTestCase(TestCase):

Expand Down
4 changes: 2 additions & 2 deletions app_namespace/tests/urls.py
@@ -1,8 +1,8 @@
"""Urls for testing app_namespace"""
from django.conf.urls import url
from django.conf.urls import include
from django.views.generic import TemplateView
from django.conf.urls import url
from django.contrib import admin
from django.views.generic import TemplateView

admin.autodiscover()

Expand Down
2 changes: 1 addition & 1 deletion setup.py
@@ -1,8 +1,8 @@
"""Setup script for django-app-namespace-template-loader"""
import os

from setuptools import setup
from setuptools import find_packages
from setuptools import setup

__version__ = '0.4.1'
__license__ = 'BSD License'
Expand Down

0 comments on commit 49444aa

Please sign in to comment.