9435dd447d
- Version 2.5.1: - Misc fixes for python 3 - Misc fixes in documentation - Allow the Pointer to relocate relative to EOF OBS-URL: https://build.opensuse.org/request/show/182511 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-construct?expand=0&rev=4
41 lines
2.6 KiB
Diff
41 lines
2.6 KiB
Diff
Index: construct-2.5.1/construct/__init__.py
|
|
===================================================================
|
|
--- construct-2.5.1.orig/construct/__init__.py
|
|
+++ construct-2.5.1/construct/__init__.py
|
|
@@ -35,7 +35,6 @@ from construct.macros import (Alias, Ali
|
|
SNInt8, SeqOfOne, String, SymmetricMapping, UBInt16, UBInt32, UBInt64, UBInt8, ULInt16, ULInt32, ULInt64,
|
|
ULInt8, UNInt16, UNInt32, UNInt64, UNInt8)
|
|
from construct.lib.expr import this
|
|
-from construct.debug import Probe, Debugger
|
|
from construct.version import version, version_string as __version__
|
|
|
|
|
|
@@ -61,14 +60,14 @@ __all__ = [
|
|
'AdaptationError', 'Adapter', 'Alias', 'Aligned', 'AlignedStruct', 'Anchor', 'Array', 'ArrayError',
|
|
'BFloat32', 'BFloat64', 'Bit', 'BitField', 'BitIntegerAdapter', 'BitIntegerError', 'BitStreamReader',
|
|
'BitStreamWriter', 'BitStruct', 'Bitwise', 'Buffered', 'CString', 'CStringAdapter', 'ConstAdapter',
|
|
- 'ConstError', 'Construct', 'ConstructError', 'Container', 'Debugger', 'Embedded', 'EmbeddedBitStruct',
|
|
+ 'ConstError', 'Construct', 'ConstructError', 'Container', 'Embedded', 'EmbeddedBitStruct',
|
|
'Enum', 'ExprAdapter', 'Field', 'FieldError', 'Flag', 'FlagsAdapter', 'FlagsContainer', 'FlagsEnum',
|
|
'FormatField', 'GreedyRange', 'HexDumpAdapter', 'HexString', 'If', 'IfThenElse', 'IndexingAdapter',
|
|
'LFloat32', 'LFloat64', 'LazyBound', 'LazyContainer', 'LengthValueAdapter', 'ListContainer', 'Magic',
|
|
'MappingAdapter', 'MappingError', 'MetaArray', 'MetaField', 'NFloat32', 'NFloat64', 'Nibble', 'NoneOf',
|
|
'Octet', 'OnDemand', 'OnDemandPointer', 'OneOf', 'OpenRange', 'Optional', 'OptionalGreedyRange',
|
|
'OverwriteError', 'Packer', 'PaddedStringAdapter', 'Padding', 'PaddingAdapter', 'PaddingError',
|
|
- 'PascalString', 'Pass', 'Peek', 'Pointer', 'PrefixedArray', 'Probe', 'Range', 'RangeError', 'Reconfig',
|
|
+ 'PascalString', 'Pass', 'Peek', 'Pointer', 'PrefixedArray', 'Range', 'RangeError', 'Reconfig',
|
|
'Rename', 'RepeatUntil', 'Restream', 'SBInt16', 'SBInt32', 'SBInt64', 'SBInt8', 'SLInt16', 'SLInt32',
|
|
'SLInt64', 'SLInt8', 'SNInt16', 'SNInt32', 'SNInt64', 'SNInt8', 'Select', 'SelectError', 'SeqOfOne',
|
|
'Sequence', 'SizeofError', 'SlicingAdapter', 'StaticField', 'String', 'StringAdapter', 'Struct',
|
|
@@ -77,3 +76,10 @@ __all__ = [
|
|
'ULInt8', 'UNInt16', 'UNInt32', 'UNInt64', 'UNInt8', 'Union', 'ValidationError', 'Validator', 'Value',
|
|
'this', 'Bits', 'Byte', 'Bytes', 'Const', 'Tunnel', 'Embed',
|
|
]
|
|
+
|
|
+try:
|
|
+ from construct.debug import Probe, Debugger
|
|
+ __all__ = __all__ + ['Debugger', 'Probe']
|
|
+except ImportError:
|
|
+ pass
|
|
+
|