From c033b7ea466c4e50690a3ed11ef3f8489e41cd93 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Mon, 12 Jan 2015 12:35:30 -0200 Subject: [PATCH] Fixed? urljoin problem --- colab/proxy/gitlab/data_api.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/colab/proxy/gitlab/data_api.py b/colab/proxy/gitlab/data_api.py index 35aee2c..aa92ee6 100644 --- a/colab/proxy/gitlab/data_api.py +++ b/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 -- libgit2 0.21.2