From: Diane Trout <diane@ghic.org>
Date: Thu, 13 Feb 2014 01:28:50 +0000 (-0800)
Subject: Just use the python 2 url parsers instead of trying to pull it out of requests
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=656d4c2cd964fa689dfa8b642818bc58a05b2615

Just use the python 2 url parsers instead of trying to pull it out of requests
---

diff --git a/htsworkflow/submission/encoded.py b/htsworkflow/submission/encoded.py
index 1228d38..e935dbc 100644
--- a/htsworkflow/submission/encoded.py
+++ b/htsworkflow/submission/encoded.py
@@ -10,9 +10,8 @@ import logging
 import json
 import jsonschema
 import requests
-from requests.utils import urlparse, urlunparse
 import types
-from urlparse import urljoin
+from urlparse import urljoin, urlparse, urlunparse
 
 LOGGER = logging.getLogger(__name__)