Browse code

Merge pull request #332 from orenhe/err_msg_fix

use_ssl -> use_https in error message, as latter is the true s3cfg var

Matt Domsch authored on 2014/05/11 21:27:13
Showing 1 changed files
... ...
@@ -40,7 +40,7 @@ class ConnMan(object):
40 40
         conn = None
41 41
         if cfg.proxy_host != "":
42 42
             if ssl:
43
-                raise ParameterError("use_ssl=True can't be used with proxy")
43
+                raise ParameterError("use_https=True can't be used with proxy")
44 44
             conn_id = "proxy://%s:%s" % (cfg.proxy_host, cfg.proxy_port)
45 45
         else:
46 46
             conn_id = "http%s://%s" % (ssl and "s" or "", hostname)