From b4f2866f0f3c53b2824c91cdba41b1f9bf6a20f8 Mon Sep 17 00:00:00 2001 From: medmunds Date: Sat, 12 Jan 2013 11:45:44 -0800 Subject: [PATCH] Python 3.2 fixes - Absolute imports - Unicode strings --- djrill/__init__.py | 4 ++-- djrill/tests/__init__.py | 8 ++++---- djrill/views.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/djrill/__init__.py b/djrill/__init__.py index 0b67a0d..c842d77 100644 --- a/djrill/__init__.py +++ b/djrill/__init__.py @@ -2,6 +2,8 @@ from django.conf import settings from django.contrib.admin.sites import AdminSite from django.utils.text import capfirst +from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError + VERSION = (0, 2, 0) __version__ = '.'.join([str(x) for x in VERSION]) @@ -10,8 +12,6 @@ __version__ = '.'.join([str(x) for x in VERSION]) MANDRILL_API_URL = getattr(settings, "MANDRILL_API_URL", "http://mandrillapp.com/api/1.0") -from exceptions import MandrillAPIError, NotSupportedByMandrillError - class DjrillAdminSite(AdminSite): index_template = "djrill/index.html" custom_views = [] diff --git a/djrill/tests/__init__.py b/djrill/tests/__init__.py index 767ad30..1dd0c92 100644 --- a/djrill/tests/__init__.py +++ b/djrill/tests/__init__.py @@ -1,4 +1,4 @@ -from test_admin import * -from test_legacy import * -from test_mandrill_send import * -from test_mandrill_send_template import * +from djrill.tests.test_admin import * +from djrill.tests.test_legacy import * +from djrill.tests.test_mandrill_send import * +from djrill.tests.test_mandrill_send_template import * diff --git a/djrill/views.py b/djrill/views.py index 23fee44..5264119 100644 --- a/djrill/views.py +++ b/djrill/views.py @@ -52,8 +52,8 @@ class DjrillApiJsonObjectsMixin(object): def get_api_uri(self): if self.api_uri is None: - raise NotImplementedError(u"%(cls)s is missing an api_uri. Define " - u"%(cls)s.api_uri or override %(cls)s.get_api_uri()." % { + raise NotImplementedError("%(cls)s is missing an api_uri. Define " + "%(cls)s.api_uri or override %(cls)s.get_api_uri()." % { "cls": self.__class__.__name__ })