This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7606

fuzz: fix mpatch_corpus to not have an overridden __repr__ on py3
ClosedPublic

Authored by spectral on Dec 11 2019, 6:26 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG229215fc1c1c: fuzz: fix mpatch_corpus to not have an overridden __repr__ on py3

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

spectral created this revision.Dec 11 2019, 6:26 PM
pulkit accepted this revision.Dec 12 2019, 7:19 AM
This revision is now accepted and ready to land.Dec 12 2019, 7:19 AM
pulkit added a comment.Dec 12 2019, 7:49 AM

Amended following diff to make test-check-format.t happy:

diff --git a/contrib/fuzz/mpatch_corpus.py b/contrib/fuzz/mpatch_corpus.py
--- a/contrib/fuzz/mpatch_corpus.py
+++ b/contrib/fuzz/mpatch_corpus.py
@@ -16,11 +16,15 @@ args = ap.parse_args()
 
 
 if sys.version_info[0] < 3:
+
     class py2reprhack(object):
         def __repr__(self):
             """Py2 calls __repr__ for `bytes(foo)`, forward to __bytes__"""
             return self.__bytes__()
+
+
 else:
+
     class py2reprhack(object):
         """Not needed on py3."""

Revision Contents
Changeset List

PathPackages
Mcontrib/fuzz/mpatch_corpus.py (33 lines)

Diff 18627

contrib/fuzz/mpatch_corpus.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import argparse import argparse
import struct import struct
import sys
import zipfile import zipfile
from mercurial import ( from mercurial import (
hg, hg,
ui as uimod, ui as uimod,
) )
ap = argparse.ArgumentParser() ap = argparse.ArgumentParser()
ap.add_argument("out", metavar="some.zip", type=str, nargs=1) ap.add_argument("out", metavar="some.zip", type=str, nargs=1)
args = ap.parse_args() args = ap.parse_args()
class deltafrag(object): if sys.version_info[0] < 3:
class py2reprhack(object):
def __repr__(self):
"""Py2 calls __repr__ for `bytes(foo)`, forward to __bytes__"""
return self.__bytes__()
else:
class py2reprhack(object):
"""Not needed on py3."""
class deltafrag(py2reprhack):
def __init__(self, start, end, data): def __init__(self, start, end, data):
self.start = start self.start = start
self.end = end self.end = end
self.data = data self.data = data
def __repr__(self):
# py2 calls __repr__ when you do `bytes(foo)`
return self.__bytes__()
def __bytes__(self): def __bytes__(self):
return ( return (
struct.pack(">lll", self.start, self.end, len(self.data)) struct.pack(">lll", self.start, self.end, len(self.data))
+ self.data + self.data
) )
class delta(object): class delta(py2reprhack):
def __init__(self, frags): def __init__(self, frags):
self.frags = frags self.frags = frags
def __repr__(self):
# py2 calls __repr__ when you do `bytes(foo)`
return self.__bytes__()
def __bytes__(self): def __bytes__(self):
return b''.join(bytes(f) for f in self.frags) return b''.join(bytes(f) for f in self.frags)
class corpus(object): class corpus(py2reprhack):
def __init__(self, base, deltas): def __init__(self, base, deltas):
self.base = base self.base = base
self.deltas = deltas self.deltas = deltas
def __repr__(self):
# py2 calls __repr__ when you do `bytes(foo)`
return self.__bytes__()
def __bytes__(self): def __bytes__(self):
deltas = [bytes(d) for d in self.deltas] deltas = [bytes(d) for d in self.deltas]
parts = ( parts = (
[ [
struct.pack(">B", len(deltas) + 1), struct.pack(">B", len(deltas) + 1),
struct.pack(">H", len(self.base)), struct.pack(">H", len(self.base)),
] ]
+ [struct.pack(">H", len(d)) for d in deltas] + [struct.pack(">H", len(d)) for d in deltas]