Python 3.x import fix, don't test for 3.4 as django doesn't support

macropin · macropin · commit c95752cd0319 · 2014-09-02T16:06:32.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ python:
   - 2.7
   - 3.2
   - 3.3
-  - 3.4
 
 env:
   - DJANGO=Django==1.4.13
@@ -18,8 +17,6 @@ matrix:
       env: DJANGO=Django==1.4.13
     - python: 3.3
       env: DJANGO=Django==1.4.13
-    - python: 3.4
-      env: DJANGO=Django==1.4.13
     - python: 2.6
       env: DJANGO=git+https://github.com/django/django.git@stable/1.7.x#egg=Django
 
diff --git a/webhook/tests.py b/webhook/tests.py
@@ -1,4 +1,7 @@
-import urlparse
+try:
+    from urllib import parse as urlparse
+except ImportError:
+    import urlparse
 
 from django.test import TestCase, RequestFactory
 from django.core.urlresolvers import reverse_lazy
diff --git a/webhook/views.py b/webhook/views.py
@@ -1,4 +1,7 @@
-import urlparse
+try:
+    from urllib import parse as urlparse
+except ImportError:
+    import urlparse
 
 from django.views.generic.edit import UpdateView
 from django.views.decorators.csrf import csrf_exempt
