[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.9 release branch

[benjamin.peterson]

https://hg.python.org/cpython/rev/24f86799e9d3
changeset:   93660:24f86799e9d3
branch:      2.7
parent:      93658:f55ab5c2420f
parent:      93659:fee117d5c894
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Nov 29 23:06:22 2014 -0500
summary:
  merge 2.7.9 release branch

files:
  Lib/xmlrpclib.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -1497,7 +1497,7 @@
                 )
         else:
             chost, self._extra_headers, x509 = self.get_host_info(host)
-            self._connection = host, HTTPS(chost, None, context=context, **(x509 or {}))
+            self._connection = host, HTTPS(chost, None, context=self.context, **(x509 or {}))
             return self._connection[1]
 
 ##

-- 
Repository URL: https://hg.python.org/cpython