upstream/mercurial-mirror Files · mercurial/cext/util.h

procutils: don't try to get `.buffer` if sys.stdin is None...

procutils: don't try to get `.buffer` if sys.stdin is None While hunting down following test failure of test-chg.t on Python 3, I stumbled the case when `.buffer` is not available as sys.stdin is None. --- /home/pulkit/repo/hg-committed/tests/test-chg.t +++ /home/pulkit/repo/hg-committed/tests/test-chg.t.err @@ -203,7 +203,31 @@ $ CHGDEBUG=1 chg version -q 0<&- chg: debug: * stdio fds are missing (glob) chg: debug: * execute original hg (glob) - Mercurial Distributed SCM * (glob) + Traceback (most recent call last): + File "/tmp/hgtests.avspvsq4/install/bin/hg", line 43, in <module> + dispatch.run() + File "/usr/lib/python3.6/importlib/util.py", line 233, in __getattribute__ + self.__spec__.loader.exec_module(self) + File "<frozen importlib._bootstrap_external>", line 678, in exec_module + File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/dispatch.py", line 726, in <module> + class lazyaliasentry(object): + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/dispatch.py", line 737, in lazyaliasentry + @util.propertycache + File "/usr/lib/python3.6/importlib/util.py", line 233, in __getattribute__ + self.__spec__.loader.exec_module(self) + File "<frozen importlib._bootstrap_external>", line 678, in exec_module + File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/util.py", line 3473, in <module> + f=procutil.stderr, + File "/usr/lib/python3.6/importlib/util.py", line 233, in __getattribute__ + self.__spec__.loader.exec_module(self) + File "<frozen importlib._bootstrap_external>", line 678, in exec_module + File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/utils/procutil.py", line 127, in <module> + stdin = sys.stdin.buffer + AttributeError: 'NoneType' object has no attribute 'buffer' + [1] server lifecycle ---------------- Differential Revision: https://phab.mercurial-scm.org/D9500

Augie Fackler - - Load All Authors

File last commit:

r40634:fa331960 default


                r46699:81c1f5d1

default

Download file

             util.h
        
                    74 lines
            
             | 2.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / util.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       util.h - utility functions for interfacing with the various python APIs.

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

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_UTIL_H_

      #define _HG_UTIL_H_

      #include "compat.h"

      #if PY_MAJOR_VERSION >= 3

      #define IS_PY3K

      #endif

      /* helper to switch things like string literal depending on Python version */

      #ifdef IS_PY3K

      #define PY23(py2, py3) py3

      #else

      #define PY23(py2, py3) py2

      #endif

      /* clang-format off */

      typedef struct {

      	PyObject_HEAD

      	char state;

      	int mode;

      	int size;

      	int mtime;

      } dirstateTupleObject;

      /* clang-format on */

      extern PyTypeObject dirstateTupleType;

      #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

      #ifndef MIN

      #define MIN(a, b) (((a) < (b)) ? (a) : (b))

      #endif

      /* VC9 doesn't include bool and lacks stdbool.h based on my searching */

      #if defined(_MSC_VER) || __STDC_VERSION__ < 199901L

      #define true 1

      #define false 0

      typedef unsigned char bool;

      #else

      #include <stdbool.h>

      #endif

      static inline PyObject *_dict_new_presized(Py_ssize_t expected_size)

      {

      	/* _PyDict_NewPresized expects a minused parameter, but it actually

      	   creates a dictionary that's the nearest power of two bigger than the

      	   parameter. For example, with the initial minused = 1000, the

      	   dictionary created has size 1024. Of course in a lot of cases that

      	   can be greater than the maximum load factor Python's dict object

      	   expects (= 2/3), so as soon as we cross the threshold we'll resize

      	   anyway. So create a dictionary that's at least 3/2 the size. */

      	return _PyDict_NewPresized(((1 + expected_size) / 2) * 3);

      }

      /* Convert a PyInt or PyLong to a long. Returns false if there is an

         error, in which case an exception will already have been set. */

      static inline bool pylong_to_long(PyObject *pylong, long *out)

      {

      	*out = PyLong_AsLong(pylong);

      	/* Fast path to avoid hitting PyErr_Occurred if the value was obviously

      	 * not an error. */

      	if (*out != -1) {

      		return true;

      	}

      	return PyErr_Occurred() == NULL;

      }

      #endif /* _HG_UTIL_H_ */

	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

				/*
				util.h - utility functions for interfacing with the various python APIs.

				This software may be used and distributed according to the terms of
				the GNU General Public License, incorporated herein by reference.
				*/

				#ifndef _HG_UTIL_H_
				#define _HG_UTIL_H_

				#include "compat.h"

				#if PY_MAJOR_VERSION >= 3
				#define IS_PY3K
				#endif

				/* helper to switch things like string literal depending on Python version */
				#ifdef IS_PY3K
				#define PY23(py2, py3) py3
				#else
				#define PY23(py2, py3) py2
				#endif

				/* clang-format off */
				typedef struct {
				PyObject_HEAD
				char state;
				int mode;
				int size;
				int mtime;
				} dirstateTupleObject;
				/* clang-format on */

				extern PyTypeObject dirstateTupleType;
				#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

				#ifndef MIN
				#define MIN(a, b) (((a) < (b)) ? (a) : (b))
				#endif
				/* VC9 doesn't include bool and lacks stdbool.h based on my searching */
				#if defined(_MSC_VER) \|\| __STDC_VERSION__ < 199901L
				#define true 1
				#define false 0
				typedef unsigned char bool;
				#else
				#include <stdbool.h>
				#endif

				static inline PyObject *_dict_new_presized(Py_ssize_t expected_size)
				{
				/* _PyDict_NewPresized expects a minused parameter, but it actually
				creates a dictionary that's the nearest power of two bigger than the
				parameter. For example, with the initial minused = 1000, the
				dictionary created has size 1024. Of course in a lot of cases that
				can be greater than the maximum load factor Python's dict object
				expects (= 2/3), so as soon as we cross the threshold we'll resize
				anyway. So create a dictionary that's at least 3/2 the size. */
				return _PyDict_NewPresized(((1 + expected_size) / 2) * 3);
				}

				/* Convert a PyInt or PyLong to a long. Returns false if there is an
				error, in which case an exception will already have been set. */
				static inline bool pylong_to_long(PyObject pylong, long out)
				{
				*out = PyLong_AsLong(pylong);
				/* Fast path to avoid hitting PyErr_Occurred if the value was obviously
				* not an error. */
				if (*out != -1) {
				return true;
				}
				return PyErr_Occurred() == NULL;
				}

				#endif /* _HG_UTIL_H_ */