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

     1

#!/usr/bin/env python3

     2

from __future__ import absolute_import, print_function

     3

     4

import sys

     5

     6

from mercurial import (

     7

    commands,

     8

    localrepo,

     9

    ui as uimod,

    10

)

    11

    12

print_ = print

    13

    14

    15

def print(*args, **kwargs):

    16

    """print() wrapper that flushes stdout buffers to avoid py3 buffer issues

    17

    18

    We could also just write directly to sys.stdout.buffer the way the

    19

    ui object will, but this was easier for porting the test.

    20

    """

    21

    print_(*args, **kwargs)

    22

    sys.stdout.flush()

    23

    24

    25

u = uimod.ui.load()

    26

    27

print('% creating repo')

    28

repo = localrepo.instance(u, b'.', create=True)

    29

    30

f = open('test.py', 'w')

    31

try:

    32

    f.write('foo\n')

    33

finally:

    34

    f.close

    35

    36

print('% add and commit')

    37

commands.add(u, repo, b'test.py')

    38

commands.commit(u, repo, message=b'*')

    39

commands.status(u, repo, clean=True)

    40

    41

    42

print('% change')

    43

f = open('test.py', 'w')

    44

try:

    45

    f.write('bar\n')

    46

finally:

    47

    f.close()

    48

    49

# this would return clean instead of changed before the fix

    50

commands.status(u, repo, clean=True, modified=True)