Merge branch 'fix_tls' into develop

Itxaka · Itxaka · commit f126b411fdf1 · 2014-03-06T09:56:00.000+01:00
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -27,8 +27,10 @@ def __init__(self, host, token="", verify_ssl=True):
             self.host = host[:-1]
         else:
             self.host = host
-        if self.host[:7] != 'http://':
-            self.host = 'http://' + self.host
+        if self.host[:7] == 'http://' or self.host[:8] == 'https://':
+            pass
+        else:
+            self.host = 'https://' + self.host
 
         self.api_url = self.host + "/api/v3"
         self.projects_url = self.api_url + "/projects"
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 setup(
     name = "pyapi-gitlab",
-    version = "6.2.0",
+    version = "6.2.1",
     packages = find_packages(),
     install_requires = ['requests', 'markdown'],
     # metadata for upload to PyPI
