summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2017-12-07 16:40:01 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2017-12-07 16:40:01 +0100
commit1d269c9f1d41e033517f0aecc88aae4d4942d959 (patch)
treeb68d57c9b09ae83eeb3b42b84884c9a1bda7f147
parenta2edc40a47ec4cb45426599692f5f7e7c222d710 (diff)
downloaddjango-payments-taler-1d269c9f1d41e033517f0aecc88aae4d4942d959.tar.gz
django-payments-taler-1d269c9f1d41e033517f0aecc88aae4d4942d959.tar.bz2
django-payments-taler-1d269c9f1d41e033517f0aecc88aae4d4942d959.zip
fix import error for 2.7
-rw-r--r--payments/taler/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/payments/taler/__init__.py b/payments/taler/__init__.py
index 191150c..c458879 100644
--- a/payments/taler/__init__.py
+++ b/payments/taler/__init__.py
@@ -26,7 +26,10 @@ from .. import RedirectNeeded, PaymentStatus
import re
from django.http import HttpResponse, JsonResponse
import requests
-from urllib.parse import urljoin
+try:
+ from urllib.parse import urljoin
+except ImportError:
+ from urlparse import urljoin
import logging
from django.conf import settings
from .amount import Amount, BadAmount