diff --git a/construct-2.5.5-reupload.tar.gz b/construct-2.5.5-reupload.tar.gz deleted file mode 100644 index 5ca349b..0000000 --- a/construct-2.5.5-reupload.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6eef7869dca32dabee1797350e3161e8f073ecac9fc0cf36f9264a941c107111 -size 688114 diff --git a/construct-2.8.10.tar.gz b/construct-2.8.10.tar.gz new file mode 100644 index 0000000..81b9cf6 --- /dev/null +++ b/construct-2.8.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9030e9db1163b7786d2c058a97ad92640f45d38f2795384cbac5e2ece77921b9 +size 719537 diff --git a/python-construct.changes b/python-construct.changes index 0cefcaa..48775ba 100644 --- a/python-construct.changes +++ b/python-construct.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 18 09:42:16 UTC 2017 - matwey.kornilov@gmail.com + +- Version 2.8.10: + - no changelog available + ------------------------------------------------------------------- Mon Oct 10 12:45:01 UTC 2016 - dmueller@suse.com diff --git a/python-construct.spec b/python-construct.spec index 375590c..6ca6d62 100644 --- a/python-construct.spec +++ b/python-construct.spec @@ -1,7 +1,7 @@ # # spec file for package python-construct # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python-construct -Version: 2.5.5 +Version: 2.8.10 Release: 0 Summary: A powerful declarative parser/builder for binary data License: MIT Group: Development/Languages/Python Url: http://construct.readthedocs.org -Source: https://pypi.io/packages/source/c/construct/construct-%{version}-reupload.tar.gz +Source: https://pypi.io/packages/source/c/construct/construct-%{version}.tar.gz # PATCH-FEATURE-OPENSUSE split_debug.patch matwey.kornilov@gmail.com -- make debug.py non-loadable Patch0: split_debug.patch BuildRequires: python-devel diff --git a/split_debug.patch b/split_debug.patch index 4610974..cc7a694 100644 --- a/split_debug.patch +++ b/split_debug.patch @@ -1,40 +1,28 @@ -Index: construct-2.5.5/construct/__init__.py +Index: construct-2.8.10/construct/__init__.py =================================================================== ---- construct-2.5.5.orig/construct/__init__.py -+++ construct-2.5.5/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, GreedyString) - from construct.lib.expr import this --from construct.debug import Probe, Debugger - from construct.version import version, version_string as __version__ +--- construct-2.8.10.orig/construct/__init__.py ++++ construct-2.8.10/construct/__init__.py +@@ -21,7 +21,6 @@ Hands-on example: + from construct.core import * + from construct.expr import this, Path, Path2, PathFunc, len_, sum_, min_, max_, abs_, obj_, True_, False_ +-from construct.debug import Probe, ProbeInto, Debugger + from construct.version import version, version_string, release_date + from construct import lib + +@@ -40,8 +39,12 @@ __version__ = version_string + # exposed names + #=============================================================================== + __all__ = [ +- 'AdaptationError', 'Alias', 'Aligned', 'AlignedStruct', 'Array', 'Bit', 'BitIntegerError', 'BitStruct', 'Bitwise', 'CString', 'Construct', 'ConstructError', 'Container', 'Debugger', 'EmbeddedBitStruct', 'Enum', 'ExprAdapter', 'FieldError', 'Flag', 'FlagsContainer', 'FlagsEnum', 'Bytes', 'FormatField', 'GreedyRange', 'HexDump', 'HexString', 'If', 'IfThenElse', 'Indexing', 'LazyBound', 'LazyContainer', 'ListContainer', 'Mapping', 'MappingError', 'Nibble', 'NoneOf', 'Octet', 'OnDemand', 'OnDemandPointer', 'OneOf', 'Optional', 'OverwriteError', 'Packer', 'Padding', 'PaddingError', 'PascalString', 'Pass', 'Peek', 'Pointer', 'PrefixedArray', 'Probe', 'Range', 'RangeError', 'Renamed', 'RepeatUntil', 'Select', 'SelectError', 'Sequence', 'SizeofError', 'Slicing', 'String', 'Struct', 'Subconstruct', 'Switch', 'SwitchError', 'SymmetricMapping', 'Terminated', 'TerminatedError', 'UnionError', 'Union', 'ValidationError', 'Validator', 'Computed', 'Byte', 'Bytes', 'Tunnel', 'Embedded', 'Const', 'ConstError', 'VarInt', 'StringError', 'Checksum', 'ByteSwapped', 'LazyStruct', 'Numpy', 'Adapter', 'SymmetricAdapter', 'Tunnel', 'Compressed', 'GreedyBytes', 'Prefixed', 'Padded', 'GreedyString', 'RawCopy', 'LazyRange', 'LazySequence', 'LazySequenceContainer', 'BitsInteger', 'BytesInteger', '__author__', '__version__','Restreamed', 'RestreamedBytesIO', 'Bytewise', 'LazyRangeContainer', 'BitsSwapped', 'RebufferedBytesIO','Rebuffered','version','version_string','lib','Seek','Tell','setglobalstringencoding','globalstringencoding','NamedTuple','ExprValidator','Filter','Hex','Error','ExplicitError','release_date','Rebuild','Check','len_','sum_','min_','max_','abs_','obj_','singleton','singletonfunction', 'this', 'Path','Path2','PathFunc','FocusedSeq','FocusedError','ExprSymmetricAdapter','True_','False_','BoundBytesIO','ProbeInto','Default', +- +-] + ["Int%s%s%s" % (n,us,bln) for n in (8,16,32,64) for us in "us" for bln in "bln"] + ["Int24ub","Int24ul","Int24sb","Int24sl"] + ["Float%s%s" % (n,bl) for n in (32,64) for bl in "bl"] + ["Single","Double"] ++ 'AdaptationError', 'Alias', 'Aligned', 'AlignedStruct', 'Array', 'Bit', 'BitIntegerError', 'BitStruct', 'Bitwise', 'CString', 'Construct', 'ConstructError', 'Container', 'EmbeddedBitStruct', 'Enum', 'ExprAdapter', 'FieldError', 'Flag', 'FlagsContainer', 'FlagsEnum', 'Bytes', 'FormatField', 'GreedyRange', 'HexDump', 'HexString', 'If', 'IfThenElse', 'Indexing', 'LazyBound', 'LazyContainer', 'ListContainer', 'Mapping', 'MappingError', 'Nibble', 'NoneOf', 'Octet', 'OnDemand', 'OnDemandPointer', 'OneOf', 'Optional', 'OverwriteError', 'Packer', 'Padding', 'PaddingError', 'PascalString', 'Pass', 'Peek', 'Pointer', 'PrefixedArray', 'Range', 'RangeError', 'Renamed', 'RepeatUntil', 'Select', 'SelectError', 'Sequence', 'SizeofError', 'Slicing', 'String', 'Struct', 'Subconstruct', 'Switch', 'SwitchError', 'SymmetricMapping', 'Terminated', 'TerminatedError', 'UnionError', 'Union', 'ValidationError', 'Validator', 'Computed', 'Byte', 'Bytes', 'Tunnel', 'Embedded', 'Const', 'ConstError', 'VarInt', 'StringError', 'Checksum', 'ByteSwapped', 'LazyStruct', 'Numpy', 'Adapter', 'SymmetricAdapter', 'Tunnel', 'Compressed', 'GreedyBytes', 'Prefixed', 'Padded', 'GreedyString', 'RawCopy', 'LazyRange', 'LazySequence', 'LazySequenceContainer', 'BitsInteger', 'BytesInteger', '__author__', '__version__', 'Restreamed', 'RestreamedBytesIO', 'Bytewise', 'LazyRangeContainer', 'BitsSwapped', 'RebufferedBytesIO', 'Rebuffered', 'version', 'version_string', 'lib', 'Seek', 'Tell', 'setglobalstringencoding', 'globalstringencoding', 'NamedTuple', 'ExprValidator', 'Filter', 'Hex', 'Error', 'ExplicitError', 'release_date', 'Rebuild', 'Check', 'len_', 'sum_', 'min_', 'max_', 'abs_', 'obj_', 'singleton', 'singletonfunction', 'this', 'Path', 'Path2', 'PathFunc', 'FocusedSeq', 'FocusedError', 'ExprSymmetricAdapter', 'True_', 'False_', 'BoundBytesIO', 'Default', + ++] + ["Int%s%s%s" % (n, us, bln) for n in (8, 16, 32, 64) for us in "us" for bln in "bln"] + ["Int24ub", "Int24ul", "Int24sb", "Int24sl"] + ["Float%s%s" % (n, bl) for n in (32, 64) for bl in "bl"] + ["Single", "Double"] -@@ -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'] ++ from construct.debug import Probe, Debugger, ProbeInto ++ __all__ = __all__ + ['Debugger', 'Probe', 'ProbeInto'] +except ImportError: + pass -+