aboutsummaryrefslogtreecommitdiffstats
path: root/brevisurl/backends/local.py
diff options
context:
space:
mode:
authorVladimir Gorej2012-09-17 13:34:01 +0200
committerVladimir Gorej2012-09-17 13:34:01 +0200
commit5e37d36d5b8a241d458d54fa300ff3b7bfed8f5f (patch)
treeb3a010de1af7e3b4439fb9ecccfd2e7fefabe492 /brevisurl/backends/local.py
parenta99fc53d8ae3928ddb68bc3f2d6875f670c3cd1b (diff)
downloaddjango-brevisurl-5e37d36d5b8a241d458d54fa300ff3b7bfed8f5f.tar.bz2
Issue #13; using absurl util whenrever possible
Diffstat (limited to 'brevisurl/backends/local.py')
-rw-r--r--brevisurl/backends/local.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/brevisurl/backends/local.py b/brevisurl/backends/local.py
index e09fb53..2415694 100644
--- a/brevisurl/backends/local.py
+++ b/brevisurl/backends/local.py
@@ -9,6 +9,7 @@ import brevisurl.settings
from brevisurl import Error
from brevisurl.backends.base import BaseBrevisUrlBackend
from brevisurl.models import ShortUrl
+from brevisurl.utils import absurl
log = logging.getLogger(__name__)
@@ -42,15 +43,11 @@ class BrevisUrlBackend(BaseBrevisUrlBackend):
domain = brevisurl.settings.LOCAL_BACKEND_DOMAIN.rstrip('/')
else:
# Domain is taken from django site framework.
- domain = '{protocol:s}://{domain:s}'.format(protocol=brevisurl.settings.LOCAL_BACKEND_DOMAIN_PROTOCOL,
- domain=Site.objects.get_current().domain)
- # Generating url path for shortened url.
- url_path = reverse('brevisurl_redirect', kwargs={'token': self.__generate_token()})
- if brevisurl.settings.LOCAL_BACKEND_STRIP_TOKEN_URL_SLASH:
- url_path = url_path.lstrip('/')
+ domain = Site.objects.get_current().domain
# Saving newly generated shortened url.
short_url.original_url = original_url
- short_url.shortened_url = '{domain:s}{url_path:s}'.format(domain=domain, url_path=url_path)
+ short_url.shortened_url = absurl(domain=domain, path=reverse('brevisurl_redirect',
+ kwargs={'token': self.__generate_token()}))
short_url.backend = self.class_path
short_url.save()
log.info('Url "%s" shortened to "%s"', original_url, short_url.shortened_url)