This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2450

util: handle fileno() on Python 3 throwing io.UnsupportedOperation
ClosedPublic

Authored by durin42 on Feb 26 2018, 1:02 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1ca4e86c7265: util: handle fileno() on Python 3 throwing io.UnsupportedOperation
Summary

Fortunately, the exception exists on Python 2 so we don't have to do
something weirder than this.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Feb 26 2018, 1:02 AM
Closed by commit rHG1ca4e86c7265: util: handle fileno() on Python 3 throwing io.UnsupportedOperation (authored by durin42). · Explain WhyFeb 26 2018, 8:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (6 lines)

Diff 6122

mercurial/util.py

import codecs import codecs
import collections import collections
import contextlib import contextlib
import datetime import datetime
import errno import errno
import gc import gc
import hashlib import hashlib
import imp import imp
import io
import itertools import itertools
import mmap import mmap
import os import os
import platform as pyplatform import platform as pyplatform
import re as remod import re as remod
import shutil import shutil
import signal import signal
import socket import socket
def _sethgexecutable(path): def _sethgexecutable(path):
"""set location of the 'hg' executable""" """set location of the 'hg' executable"""
global _hgexecutable global _hgexecutable
_hgexecutable = path _hgexecutable = path
def _isstdout(f): def _isstdout(f):
fileno = getattr(f, 'fileno', None) fileno = getattr(f, 'fileno', None)
try:
return fileno and fileno() == sys.__stdout__.fileno() return fileno and fileno() == sys.__stdout__.fileno()
except io.UnsupportedOperation:
return False # fileno() raised UnsupportedOperation
def shellenviron(environ=None): def shellenviron(environ=None):
"""return environ with optional override, useful for shelling out""" """return environ with optional override, useful for shelling out"""
def py2shell(val): def py2shell(val):
'convert python object into string that is useful to shell' 'convert python object into string that is useful to shell'
if val is None or val is False: if val is None or val is False:
return '0' return '0'
if val is True: if val is True: