From patchwork Tue Dec 14 21:12:02 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D11921: pytype: stop excluding statprof.py
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 50248
Message-Id: <differential-rev-PHID-DREV-2pymweecnybxy7r7473x-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Tue, 14 Dec 2021 21:12:02 +0000

mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This seems to have worked fine before (at least on Linux).  We could just add
  suppression comments, but this file already imports from the mercurial package,
  which seems to prevent this from running as a standalone program because of the
  relative import of `pycompat`.  PyCharm isn't happy either way.
  
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 501, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 1091, in main
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 501, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 431, in profile
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 522, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 1091, in main
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 522, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 431, in profile
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 523, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 1091, in main
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 523, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 431, in profile
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 524, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 1091, in main
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 524, in display:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)
    Called from (traceback):
      line 431, in profile
    File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 796, in _write:
        Function TextIO.write was called with the wrong arguments [wrong-arg-types]
             Expected: (self, s: str)
      Actually passed: (self, s: bytes)

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11921

AFFECTED FILES
  mercurial/statprof.py
  tests/test-check-pytype.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/tests/test-check-pytype.t b/tests/test-check-pytype.t
--- a/tests/test-check-pytype.t
+++ b/tests/test-check-pytype.t
@@ -32,7 +32,6 @@
 mercurial/pycompat.py         # bytes vs str issues
 mercurial/repoview.py         # [attribute-error]
 mercurial/sslutil.py          # [attribute-error]
-mercurial/statprof.py         # bytes vs str on TextIO.write() [wrong-arg-types]
 mercurial/testing/storage.py  # tons of [attribute-error]
 mercurial/ui.py               # [attribute-error], [wrong-arg-types]
 mercurial/unionrepo.py        # ui, svfs, unfiltered [attribute-error]
@@ -72,7 +71,6 @@
   >    -x mercurial/pycompat.py \
   >    -x mercurial/repoview.py \
   >    -x mercurial/sslutil.py \
-  >    -x mercurial/statprof.py \
   >    -x mercurial/testing/storage.py \
   >    -x mercurial/thirdparty \
   >    -x mercurial/ui.py \
diff --git a/mercurial/statprof.py b/mercurial/statprof.py
--- a/mercurial/statprof.py
+++ b/mercurial/statprof.py
@@ -494,9 +494,9 @@
         data = state
 
     if fp is None:
-        import sys
+        from .utils import procutil
 
-        fp = sys.stdout
+        fp = procutil.stdout
     if len(data.samples) == 0:
         fp.write(b'No samples recorded.\n')
         return