fix(urls): correctly join urls

NCI-GDC · Aug 17, 2015 · ef04dfa · ef04dfa
1 parent 7337f9f
commit ef04dfa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gdc_client/download/client.py b/gdc_client/download/client.py
@@ -95,8 +95,8 @@ class GDCHTTPDownloadClient(GDCDownloadMixin, HTTPClient):
 
     def __init__(self, uri, download_related_files=True,
                  download_annotations=True, *args, **kwargs):
-        self.base_uri = uri
-        self.data_uri = uri + 'data'
+        self.base_uri = self.fix_uri(uri)
+        self.data_uri = urlparse.urljoin(self.base_uri, 'data/')
         self.related_files = download_related_files
         self.annotations = download_annotations
         super(GDCDownloadMixin, self).__init__(self.data_uri, *args, **kwargs)
@@ -109,7 +109,7 @@ def __init__(self, remote_uri, download_related_files=True,
 
         remote_uri = self.fix_uri(remote_uri)
         self.base_uri = remote_uri
-        self.data_uri = remote_uri + 'data'
+        self.data_uri = urlparse.urljoin(remote_uri, 'data/')
         self.related_files = download_related_files
         self.annotations = download_annotations