diff options
Diffstat (limited to 'brevisurl')
| -rw-r--r-- | brevisurl/__init__.py | 6 | ||||
| -rw-r--r-- | brevisurl/models.py | 7 | ||||
| -rw-r--r-- | brevisurl/tests/templatetags/test_brevisurltags.py | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/brevisurl/__init__.py b/brevisurl/__init__.py index b929f1f..9429381 100644 --- a/brevisurl/__init__.py +++ b/brevisurl/__init__.py @@ -4,8 +4,8 @@ try: except ImportError: from StringIO import StringIO -import brevisurl.settings -from brevisurl.utils import load_object + +__versionstr__ = '2.0.0' def get_connection(backend=None, fail_silently=False, **kwargs): @@ -23,6 +23,8 @@ def get_connection(backend=None, fail_silently=False, **kwargs): :rtype: brevisurl.backends.base.BaseBrevisUrlBackend """ + import brevisurl.settings + from brevisurl.utils import load_object path = backend or brevisurl.settings.DEFAULT_BACKEND klass = load_object(path) return klass(fail_silently=fail_silently, **kwargs) diff --git a/brevisurl/models.py b/brevisurl/models.py index 84aeff1..cb5575b 100644 --- a/brevisurl/models.py +++ b/brevisurl/models.py @@ -2,7 +2,6 @@ import hashlib import logging from django.core.exceptions import ValidationError -from django.conf import settings from django.db import models from django.core.validators import URLValidator @@ -15,7 +14,8 @@ log = logging.getLogger(__name__) class ShortUrl(models.Model): """Model that represents shortened url.""" - original_url = models.URLField(max_length=brevis.settings.LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH, null=False, blank=False) + original_url = models.URLField(max_length=brevisurl.settings.LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH, + null=False, blank=False) original_url_hash = models.CharField(max_length=64, null=False, blank=False) shortened_url = models.URLField(max_length=200, null=False, blank=False, unique=True) backend = models.CharField(max_length=200, null=False, blank=False) @@ -27,7 +27,8 @@ class ShortUrl(models.Model): def get_connection(self, fail_silently=False): if not hasattr(self, 'brevis_connection'): if self.pk is not None: - self.brevis_connection = get_connection(backend=self.backend, fail_silently=fail_silently) + self.brevis_connection = get_connection(backend=self.backend, + fail_silently=fail_silently) else: self.brevis_connection = get_connection(fail_silently=fail_silently) return self.brevis_connection diff --git a/brevisurl/tests/templatetags/test_brevisurltags.py b/brevisurl/tests/templatetags/test_brevisurltags.py index 808dc2d..181b7a7 100644 --- a/brevisurl/tests/templatetags/test_brevisurltags.py +++ b/brevisurl/tests/templatetags/test_brevisurltags.py @@ -30,7 +30,7 @@ class TestShortenUrlTag(TestCase): def test_absurl_tag(self): url = Template(""" {% load brevisurltags %} - {% absurl brevisurl_redirect token='12345' as brevis_url %} + {% absurl "brevisurl_redirect" token='12345' as brevis_url %} {{ brevis_url|shorten_url }} """).render(Context()).strip() self.assertEqual(ShortUrl.objects.all().count(), 1) @@ -42,7 +42,7 @@ class TestShortenUrlTag(TestCase): brevisurl.settings.LOCAL_BACKEND_DOMAIN = 'http://brevisurl.net/' url = Template(""" {% load brevisurltags %} - {% absurl brevisurl_redirect token='12345' as brevis_url %} + {% absurl "brevisurl_redirect" token='12345' as brevis_url %} {{ brevis_url|shorten_url }} """).render(Context()).strip() self.assertEqual(ShortUrl.objects.all().count(), 1) |