upstream/mercurial-mirror Files · mercurial/pure/osutil.py

dispatch: don't mangle ImportError abort messages...

dispatch: don't mangle ImportError abort messages Previously, Mercurial assumed that the last word of the string representation was the name of the moduled that was imported. This assmption is incorrect, despite being true for the common case of an exception raised by the Python VM. For example, hgsubversion raises an ImportError with a helpful message if the Subversion bindings were not found. The final word of this message is not meaningful on its own, and is never the name of a module. This patch changes the output printed to be a simple stringification of the exception instance. In most cases, this will be `abort: No module named X!' rather than `abort: could not import module X!'. No functionality change; all tests pass.

Benoit Boissinot - - Load All Authors

File last commit:

r10651:5f091fc1 default


                r11053:59d0d715

stable

Download file

             osutil.py
        
                    59 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / osutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # osutil.py - pure Python version of osutil.c

      #

      #  Copyright 2009 Matt Mackall <mpm@selenic.com> and others

      #

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

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

      import os

      import stat as _stat

      posixfile = open

      def _mode_to_kind(mode):

          if _stat.S_ISREG(mode):

              return _stat.S_IFREG

          if _stat.S_ISDIR(mode):

              return _stat.S_IFDIR

          if _stat.S_ISLNK(mode):

              return _stat.S_IFLNK

          if _stat.S_ISBLK(mode):

              return _stat.S_IFBLK

          if _stat.S_ISCHR(mode):

              return _stat.S_IFCHR

          if _stat.S_ISFIFO(mode):

              return _stat.S_IFIFO

          if _stat.S_ISSOCK(mode):

              return _stat.S_IFSOCK

          return mode

      def listdir(path, stat=False, skip=None):

          '''listdir(path, stat=False) -> list_of_tuples

          Return a sorted list containing information about the entries

          in the directory.

          If stat is True, each element is a 3-tuple:

            (name, type, stat object)

          Otherwise, each element is a 2-tuple:

            (name, type)

          '''

          result = []

          prefix = path

          if not prefix.endswith(os.sep):

              prefix += os.sep

          names = os.listdir(path)

          names.sort()

          for fn in names:

              st = os.lstat(prefix + fn)

              if fn == skip and _stat.S_ISDIR(st.st_mode):

                  return []

              if stat:

                  result.append((fn, _mode_to_kind(st.st_mode), st))

              else:

                  result.append((fn, _mode_to_kind(st.st_mode)))

          return result

	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

				# osutil.py - pure Python version of osutil.c
				#
				# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				import os
				import stat as _stat

				posixfile = open

				def _mode_to_kind(mode):
				if _stat.S_ISREG(mode):
				return _stat.S_IFREG
				if _stat.S_ISDIR(mode):
				return _stat.S_IFDIR
				if _stat.S_ISLNK(mode):
				return _stat.S_IFLNK
				if _stat.S_ISBLK(mode):
				return _stat.S_IFBLK
				if _stat.S_ISCHR(mode):
				return _stat.S_IFCHR
				if _stat.S_ISFIFO(mode):
				return _stat.S_IFIFO
				if _stat.S_ISSOCK(mode):
				return _stat.S_IFSOCK
				return mode

				def listdir(path, stat=False, skip=None):
				'''listdir(path, stat=False) -> list_of_tuples

				Return a sorted list containing information about the entries
				in the directory.

				If stat is True, each element is a 3-tuple:

				(name, type, stat object)

				Otherwise, each element is a 2-tuple:

				(name, type)
				'''
				result = []
				prefix = path
				if not prefix.endswith(os.sep):
				prefix += os.sep
				names = os.listdir(path)
				names.sort()
				for fn in names:
				st = os.lstat(prefix + fn)
				if fn == skip and _stat.S_ISDIR(st.st_mode):
				return []
				if stat:
				result.append((fn, _mode_to_kind(st.st_mode), st))
				else:
				result.append((fn, _mode_to_kind(st.st_mode)))
				return result