Skip to content

fix bitwise Hex() adapter #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahaensler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bitwise Hex() adapter #1021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions construct/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-

import struct, io, binascii, itertools, collections, pickle, sys, os, hashlib, importlib, importlib.machinery, importlib.util
import math, struct, io, binascii, itertools, collections, pickle, sys, os, hashlib, importlib, importlib.machinery, importlib.util

from construct.lib import *
from construct.expr import *
from construct.version import *


#===============================================================================
# exceptions
#===============================================================================
Expand Down Expand Up @@ -3517,7 +3516,10 @@ class Hex(Adapter):
"""
def _decode(self, obj, context, path):
if isinstance(obj, integertypes):
return HexDisplayedInteger.new(obj, "0%sX" % (2 * self.subcon._sizeof(context, path)))
size = 2 * self.subcon._sizeof(context, path)
if isinstance(context._io, RestreamedBytesIO) and context._io.decoderunit == 1:
size = math.ceil(size / 8)
return HexDisplayedInteger.new(obj, "0%sX" % size)
if isinstance(obj, bytestringtype):
return HexDisplayedBytes(obj)
if isinstance(obj, dict):
Expand Down