Fixed? urljoin problem

Sergio Oliveira · Gust
1 parent 2b5c4604
Showing 1 changed file with 4 additions and 3 deletions Show diff stats
colab/proxy/gitlab/data_api.py
@@ -2,7 +2,6 @@
 import json
 import urllib
 import urllib2
-import urlparse
  
 from dateutil.parser import parse
  
@@ -22,8 +21,10 @@ class GitlabDataAPI(ProxyDataAPI):
         kwargs['private_token'] = proxy_config.get('private_token')
         params = urllib.urlencode(kwargs)
  
-        url = u'{}?{}'.format(path, params)
-        return urlparse.urljoin(upstream, url)
+        if upstream[-1] == '/':
+            upstream = upstream[:-1]
+
+        return u'{}{}?{}'.format(upstream, path, params)
  
     def fetchProjects(self):
         page = 1
...	...	@@ -2,7 +2,6 @@
2	2	import json
3	3	import urllib
4	4	import urllib2
5		-import urlparse
6	5
7	6	from dateutil.parser import parse
8	7
...	...	@@ -22,8 +21,10 @@ class GitlabDataAPI(ProxyDataAPI):
22	21	kwargs['private_token'] = proxy_config.get('private_token')
23	22	params = urllib.urlencode(kwargs)
24	23
25		- url = u'{}?{}'.format(path, params)
26		- return urlparse.urljoin(upstream, url)
	24	+ if upstream[-1] == '/':
	25	+ upstream = upstream[:-1]
	26	+
	27	+ return u'{}{}?{}'.format(upstream, path, params)
27	28
28	29	def fetchProjects(self):
29	30	page = 1
...	...