From: Diane Trout <diane@ghic.org>
Date: Wed, 18 Mar 2015 23:52:28 +0000 (-0700)
Subject: import urljoin from six.moves.urllib.parse
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=a34147b85df1e0939e64b0d15a9bd5348eb3ef37

import urljoin from six.moves.urllib.parse
---

diff --git a/experiments/test_experiments.py b/experiments/test_experiments.py
index 6fd0df5..a353f56 100644
--- a/experiments/test_experiments.py
+++ b/experiments/test_experiments.py
@@ -10,7 +10,7 @@ import os
 import shutil
 import sys
 import tempfile
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
 
 from django.conf import settings
 from django.core import mail