Python 3.2 fixes

- Absolute imports
- Unicode strings
This commit is contained in:
medmunds
2013-01-12 11:45:44 -08:00
parent c550aacbb8
commit b4f2866f0f
3 changed files with 8 additions and 8 deletions

View File

@@ -2,6 +2,8 @@ from django.conf import settings
from django.contrib.admin.sites import AdminSite from django.contrib.admin.sites import AdminSite
from django.utils.text import capfirst from django.utils.text import capfirst
from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError
VERSION = (0, 2, 0) VERSION = (0, 2, 0)
__version__ = '.'.join([str(x) for x in VERSION]) __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", MANDRILL_API_URL = getattr(settings, "MANDRILL_API_URL",
"http://mandrillapp.com/api/1.0") "http://mandrillapp.com/api/1.0")
from exceptions import MandrillAPIError, NotSupportedByMandrillError
class DjrillAdminSite(AdminSite): class DjrillAdminSite(AdminSite):
index_template = "djrill/index.html" index_template = "djrill/index.html"
custom_views = [] custom_views = []

View File

@@ -1,4 +1,4 @@
from test_admin import * from djrill.tests.test_admin import *
from test_legacy import * from djrill.tests.test_legacy import *
from test_mandrill_send import * from djrill.tests.test_mandrill_send import *
from test_mandrill_send_template import * from djrill.tests.test_mandrill_send_template import *

View File

@@ -52,8 +52,8 @@ class DjrillApiJsonObjectsMixin(object):
def get_api_uri(self): def get_api_uri(self):
if self.api_uri is None: if self.api_uri is None:
raise NotImplementedError(u"%(cls)s is missing an api_uri. Define " raise NotImplementedError("%(cls)s is missing an api_uri. Define "
u"%(cls)s.api_uri or override %(cls)s.get_api_uri()." % { "%(cls)s.api_uri or override %(cls)s.get_api_uri()." % {
"cls": self.__class__.__name__ "cls": self.__class__.__name__
}) })