This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7675

util: move common proxyobserver attributes to the base class
ClosedPublic

Authored by mharbison72 on Dec 15 2019, 11:12 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4222b9d5d4fb: util: move common proxyobserver attributes to the base class
Summary

Fixes the following pytype warnings:

line 791, in _writedata: No attribute 'logdata' on baseproxyobserver [attribute-error]
line 792, in _writedata: No attribute 'logdataapis' on baseproxyobserver [attribute-error]
line 793, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 794, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 799, in _writedata: No attribute 'logdataapis' on baseproxyobserver [attribute-error]
line 800, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 802, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 803, in _writedata: No attribute 'name' on baseproxyobserver [attribute-error]
line 805, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 809, in _writedata: No attribute 'logdataapis' on baseproxyobserver [attribute-error]
line 810, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 814, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]
line 815, in _writedata: No attribute 'name' on baseproxyobserver [attribute-error]
line 817, in _writedata: No attribute 'fh' on baseproxyobserver [attribute-error]

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (16 lines)

Diff 18817

mercurial/util.py

def setsockopt(self, *args, **kwargs): def setsockopt(self, *args, **kwargs):
return object.__getattribute__(self, '_observedcall')( return object.__getattribute__(self, '_observedcall')(
'setsockopt', *args, **kwargs 'setsockopt', *args, **kwargs
) )
class baseproxyobserver(object): class baseproxyobserver(object):
def __init__(self, fh, name, logdata, logdataapis):
self.fh = fh
self.name = name
self.logdata = logdata
self.logdataapis = logdataapis
def _writedata(self, data): def _writedata(self, data):
if not self.logdata: if not self.logdata:
if self.logdataapis: if self.logdataapis:
self.fh.write(b'\n') self.fh.write(b'\n')
self.fh.flush() self.fh.flush()
return return
# Simple case writes all data on a single line. # Simple case writes all data on a single line.
class fileobjectobserver(baseproxyobserver): class fileobjectobserver(baseproxyobserver):
"""Logs file object activity.""" """Logs file object activity."""
def __init__( def __init__(
self, fh, name, reads=True, writes=True, logdata=False, logdataapis=True self, fh, name, reads=True, writes=True, logdata=False, logdataapis=True
): ):
self.fh = fh super(fileobjectobserver, self).__init__(fh, name, logdata, logdataapis)
self.name = name
self.logdata = logdata
self.logdataapis = logdataapis
self.reads = reads self.reads = reads
self.writes = writes self.writes = writes
def read(self, res, size=-1): def read(self, res, size=-1):
if not self.reads: if not self.reads:
return return
# Python 3 can return None from reads at EOF instead of empty strings. # Python 3 can return None from reads at EOF instead of empty strings.
if res is None: if res is None:
fh, fh,
name, name,
reads=True, reads=True,
writes=True, writes=True,
states=True, states=True,
logdata=False, logdata=False,
logdataapis=True, logdataapis=True,
): ):
self.fh = fh super(socketobserver, self).__init__(fh, name, logdata, logdataapis)
self.name = name
self.reads = reads self.reads = reads
self.writes = writes self.writes = writes
self.states = states self.states = states
self.logdata = logdata
self.logdataapis = logdataapis
def makefile(self, res, mode=None, bufsize=None): def makefile(self, res, mode=None, bufsize=None):
if not self.states: if not self.states:
return return
self.fh.write(b'%s> makefile(%r, %r)\n' % (self.name, mode, bufsize)) self.fh.write(b'%s> makefile(%r, %r)\n' % (self.name, mode, bufsize))
def recv(self, res, size, flags=0): def recv(self, res, size, flags=0):