diff mercurial/bundle2.py @ 43115:4aa72cdf616f

py3: delete b'' prefix from safehasattr arguments Differential Revision: https://phab.mercurial-scm.org/D7029
author Martin von Zweigbergk <martinvonz@google.com>
date Sun, 06 Oct 2019 20:17:41 -0700
parents 86e4daa2d54c
children 8ff1ecfadcd1
line wrap: on
line diff
--- a/mercurial/bundle2.py	Tue Oct 08 19:35:30 2019 -0700
+++ b/mercurial/bundle2.py	Sun Oct 06 20:17:41 2019 -0700
@@ -936,7 +936,7 @@
 
     def close(self):
         """close underlying file"""
-        if util.safehasattr(self._fp, b'close'):
+        if util.safehasattr(self._fp, 'close'):
             return self._fp.close()
 
 
@@ -1024,7 +1024,7 @@
 
         The new part have the very same content but no partid assigned yet.
         Parts with generated data cannot be copied."""
-        assert not util.safehasattr(self.data, b'next')
+        assert not util.safehasattr(self.data, 'next')
         return self.__class__(
             self.type,
             self._mandatoryparams,
@@ -1093,7 +1093,7 @@
                 msg.append(b')')
             if not self.data:
                 msg.append(b' empty payload')
-            elif util.safehasattr(self.data, b'next') or util.safehasattr(
+            elif util.safehasattr(self.data, 'next') or util.safehasattr(
                 self.data, b'__next__'
             ):
                 msg.append(b' streamed payload')
@@ -1189,7 +1189,7 @@
         Exists to handle the different methods to provide data to a part."""
         # we only support fixed size data now.
         # This will be improved in the future.
-        if util.safehasattr(self.data, b'next') or util.safehasattr(
+        if util.safehasattr(self.data, 'next') or util.safehasattr(
             self.data, b'__next__'
         ):
             buff = util.chunkbuffer(self.data)
@@ -1336,7 +1336,7 @@
 
     def __init__(self, ui, header, fp):
         super(unbundlepart, self).__init__(fp)
-        self._seekable = util.safehasattr(fp, b'seek') and util.safehasattr(
+        self._seekable = util.safehasattr(fp, 'seek') and util.safehasattr(
             fp, b'tell'
         )
         self.ui = ui