upstream/mercurial-mirror Files · mercurial/thirdparty/zope/interface/_compat.py

run-tests: partially backout PYTHON quoting...

run-tests: partially backout PYTHON quoting In 7f8b7a060584, I quoted this to support python being installed to "Program Files". Even though the string passed to os.popen() is this: "c:/Python27/python.exe" -c "import mercurial; print (mercurial.__path__[0])" ... cmd.exe is trying to run this: 'c:/Python27/python.exe" -c "import' This caused test-hghave.t to fail, reporting 'unexpected mercurial lib: ""', because the failed execution prints nothing to stdout. Py3 fails as though it's not quoted. For whatever reason, print() shows up in the output when run with py2, but not py3, so I'm having a hard time debugging this. For now, let's fix the buildbot.

Gregory Szorc - - Load All Authors

File last commit:

r37195:68ee6182 default


                r39778:38d51371

default

Download file

             _compat.py
        
                    60 lines
            
             | 1.7 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / zope / interface / _compat.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ##############################################################################

      #

      # Copyright (c) 2006 Zope Foundation and Contributors.

      # All Rights Reserved.

      #

      # This software is subject to the provisions of the Zope Public License,

      # Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.

      # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED

      # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

      # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS

      # FOR A PARTICULAR PURPOSE.

      #

      ##############################################################################

      """Basic components support

      """

      from __future__ import absolute_import

      import sys

      import types

      if sys.version_info[0] < 3:

          def _normalize_name(name):

              if isinstance(name, basestring):

                  return unicode(name)

              raise TypeError("name must be a regular or unicode string")

          CLASS_TYPES = (type, types.ClassType)

          STRING_TYPES = (basestring,)

          _BUILTINS = '__builtin__'

          PYTHON3 = False

          PYTHON2 = True

      else:

          def _normalize_name(name):

              if isinstance(name, bytes):

                  name = str(name, 'ascii')

              if isinstance(name, str):

                  return name

              raise TypeError("name must be a string or ASCII-only bytes")

          CLASS_TYPES = (type,)

          STRING_TYPES = (str,)

          _BUILTINS = 'builtins'

          PYTHON3 = True

          PYTHON2 = False

      def _skip_under_py3k(test_method):

          import unittest

          return unittest.skipIf(sys.version_info[0] >= 3, "Only on Python 2")(test_method)

      def _skip_under_py2(test_method):

          import unittest

          return unittest.skipIf(sys.version_info[0] < 3, "Only on Python 3")(test_method)

	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

				##############################################################################
				#
				# Copyright (c) 2006 Zope Foundation and Contributors.
				# All Rights Reserved.
				#
				# This software is subject to the provisions of the Zope Public License,
				# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
				# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
				# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
				# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
				# FOR A PARTICULAR PURPOSE.
				#
				##############################################################################
				"""Basic components support
				"""
				from __future__ import absolute_import

				import sys
				import types

				if sys.version_info[0] < 3:

				def _normalize_name(name):
				if isinstance(name, basestring):
				return unicode(name)
				raise TypeError("name must be a regular or unicode string")

				CLASS_TYPES = (type, types.ClassType)
				STRING_TYPES = (basestring,)

				_BUILTINS = '__builtin__'

				PYTHON3 = False
				PYTHON2 = True

				else:

				def _normalize_name(name):
				if isinstance(name, bytes):
				name = str(name, 'ascii')
				if isinstance(name, str):
				return name
				raise TypeError("name must be a string or ASCII-only bytes")

				CLASS_TYPES = (type,)
				STRING_TYPES = (str,)

				_BUILTINS = 'builtins'

				PYTHON3 = True
				PYTHON2 = False

				def _skip_under_py3k(test_method):
				import unittest
				return unittest.skipIf(sys.version_info[0] >= 3, "Only on Python 2")(test_method)


				def _skip_under_py2(test_method):
				import unittest
				return unittest.skipIf(sys.version_info[0] < 3, "Only on Python 3")(test_method)