upstream/mercurial-mirror Files · mercurial/pycompat.py

sslutil: use CA loaded state to drive validation logic...

sslutil: use CA loaded state to drive validation logic Until now, sslkwargs may set web.cacerts=! to indicate that system certs could not be found. This is really obtuse because sslkwargs effectively sets state on a global object which bypasses wrapsocket() and is later consulted by validator.__call__. This is madness. This patch introduces an attribute on the wrapped socket instance indicating whether system CAs were loaded. We can set this directly inside wrapsocket() because that function knows everything that sslkwargs() does - and more. With this attribute set on the socket, we refactor validator.__call__ to use it. Since we no longer have a need for setting web.cacerts=! in sslkwargs, we remove that. I think the new logic is much easier to understand and will enable behavior to be changed more easily.

timeless - - Load All Authors

File last commit:

r28882:800ec7c0 default


                r29113:5b9577ed

default

Download file

             pycompat.py
        
                    123 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pycompat.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # pycompat.py - portability shim for python 3

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      """Mercurial portability shim for python 3.

      This contains aliases to hide python version-specific details from the core.

      """

      from __future__ import absolute_import

      try:

          import cStringIO as io

          stringio = io.StringIO

      except ImportError:

          import io

          stringio = io.StringIO

      try:

          import Queue as _queue

          _queue.Queue

      except ImportError:

          import queue as _queue

      empty = _queue.Empty

      queue = _queue.Queue

      class _pycompatstub(object):

          pass

      def _alias(alias, origin, items):

          """ populate a _pycompatstub

          copies items from origin to alias

          """

          def hgcase(item):

              return item.replace('_', '').lower()

          for item in items:

              try:

                  setattr(alias, hgcase(item), getattr(origin, item))

              except AttributeError:

                  pass

      urlreq = _pycompatstub()

      urlerr = _pycompatstub()

      try:

          import urllib2

          import urllib

          _alias(urlreq, urllib, (

              "addclosehook",

              "addinfourl",

              "ftpwrapper",

              "pathname2url",

              "quote",

              "splitattr",

              "splitpasswd",

              "splitport",

              "splituser",

              "unquote",

              "url2pathname",

              "urlencode",

              "urlencode",

          ))

          _alias(urlreq, urllib2, (

              "AbstractHTTPHandler",

              "BaseHandler",

              "build_opener",

              "FileHandler",

              "FTPHandler",

              "HTTPBasicAuthHandler",

              "HTTPDigestAuthHandler",

              "HTTPHandler",

              "HTTPPasswordMgrWithDefaultRealm",

              "HTTPSHandler",

              "install_opener",

              "ProxyHandler",

              "Request",

              "urlopen",

          ))

          _alias(urlerr, urllib2, (

              "HTTPError",

              "URLError",

          ))

      except ImportError:

          import urllib.request

          _alias(urlreq, urllib.request, (

              "AbstractHTTPHandler",

              "addclosehook",

              "addinfourl",

              "BaseHandler",

              "build_opener",

              "FileHandler",

              "FTPHandler",

              "ftpwrapper",

              "HTTPHandler",

              "HTTPSHandler",

              "install_opener",

              "pathname2url",

              "HTTPBasicAuthHandler",

              "HTTPDigestAuthHandler",

              "ProxyHandler",

              "quote",

              "Request",

              "splitattr",

              "splitpasswd",

              "splitport",

              "splituser",

              "unquote",

              "url2pathname",

              "urlopen",

          ))

          import urllib.error

          _alias(urlerr, urllib.error, (

              "HTTPError",

              "URLError",

          ))

      try:

          xrange

      except NameError:

          import builtins

          builtins.xrange = range

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# pycompat.py - portability shim for python 3
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				"""Mercurial portability shim for python 3.

				This contains aliases to hide python version-specific details from the core.
				"""

				from __future__ import absolute_import

				try:
				import cStringIO as io
				stringio = io.StringIO
				except ImportError:
				import io
				stringio = io.StringIO

				try:
				import Queue as _queue
				_queue.Queue
				except ImportError:
				import queue as _queue
				empty = _queue.Empty
				queue = _queue.Queue

				class _pycompatstub(object):
				pass

				def _alias(alias, origin, items):
				""" populate a _pycompatstub

				copies items from origin to alias
				"""
				def hgcase(item):
				return item.replace('_', '').lower()
				for item in items:
				try:
				setattr(alias, hgcase(item), getattr(origin, item))
				except AttributeError:
				pass

				urlreq = _pycompatstub()
				urlerr = _pycompatstub()
				try:
				import urllib2
				import urllib
				_alias(urlreq, urllib, (
				"addclosehook",
				"addinfourl",
				"ftpwrapper",
				"pathname2url",
				"quote",
				"splitattr",
				"splitpasswd",
				"splitport",
				"splituser",
				"unquote",
				"url2pathname",
				"urlencode",
				"urlencode",
				))
				_alias(urlreq, urllib2, (
				"AbstractHTTPHandler",
				"BaseHandler",
				"build_opener",
				"FileHandler",
				"FTPHandler",
				"HTTPBasicAuthHandler",
				"HTTPDigestAuthHandler",
				"HTTPHandler",
				"HTTPPasswordMgrWithDefaultRealm",
				"HTTPSHandler",
				"install_opener",
				"ProxyHandler",
				"Request",
				"urlopen",
				))
				_alias(urlerr, urllib2, (
				"HTTPError",
				"URLError",
				))

				except ImportError:
				import urllib.request
				_alias(urlreq, urllib.request, (
				"AbstractHTTPHandler",
				"addclosehook",
				"addinfourl",
				"BaseHandler",
				"build_opener",
				"FileHandler",
				"FTPHandler",
				"ftpwrapper",
				"HTTPHandler",
				"HTTPSHandler",
				"install_opener",
				"pathname2url",
				"HTTPBasicAuthHandler",
				"HTTPDigestAuthHandler",
				"ProxyHandler",
				"quote",
				"Request",
				"splitattr",
				"splitpasswd",
				"splitport",
				"splituser",
				"unquote",
				"url2pathname",
				"urlopen",
				))
				import urllib.error
				_alias(urlerr, urllib.error, (
				"HTTPError",
				"URLError",
				))

				try:
				xrange
				except NameError:
				import builtins
				builtins.xrange = range