Skip to content

Commit 6b5955d

Browse files
tcalmanttcalmant
authored
Merge pull request #66 from tcalmant/version-bump
Version bump
2 parents a56433a + b88526c commit 6b5955d

21 files changed

Lines changed: 98 additions & 99 deletions

‎javaobj/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
1414
:authors: Volodymyr Buell, Thomas Calmant
1515
:license: Apache License 2.0
16-
:version: 0.4.4
16+
:version: 0.5.0
1717
:status: Alpha
1818
1919
..
2020
21-
Copyright 2024 Thomas Calmant
21+
Copyright 2026 Thomas Calmant
2222
2323
Licensed under the Apache License, Version 2.0 (the "License");
2424
you may not use this file except in compliance with the License.

‎javaobj/constants.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
55
:authors: Thomas Calmant
66
:license: Apache License 2.0
7-
:version: 0.4.4
7+
:version: 0.5.0
88
:status: Alpha
99
1010
..
1111
12-
Copyright 2024 Thomas Calmant
12+
Copyright 2026 Thomas Calmant
1313
1414
Licensed under the Apache License, Version 2.0 (the "License");
1515
you may not use this file except in compliance with the License.

‎javaobj/modifiedutf8.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
1212
:authors: Scott Stephens (@swstephe), @guywithface
1313
:license: Apache License 2.0
14-
:version: 0.4.4
14+
:version: 0.5.0
1515
:status: Alpha
1616
"""
1717

1818
from __future__ import unicode_literals
1919

2020
import sys
2121

22-
2322
# Module version
2423
__version_info__ = (0, 4, 4)
2524
__version__ = ".".join(str(x) for x in __version_info__)

‎javaobj/utils.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
88
:authors: Thomas Calmant
99
:license: Apache License 2.0
10-
:version: 0.4.4
10+
:version: 0.5.0
1111
:status: Alpha
1212
1313
..
1414
15-
Copyright 2024 Thomas Calmant
15+
Copyright 2026 Thomas Calmant
1616
1717
Licensed under the Apache License, Version 2.0 (the "License");
1818
you may not use this file except in compliance with the License.
@@ -30,12 +30,12 @@
3030
from __future__ import absolute_import
3131

3232
# Standard library
33-
from typing import IO, Tuple # noqa: F401
3433
import gzip
3534
import logging
3635
import os
3736
import struct
3837
import sys
38+
from typing import IO, Tuple # noqa: F401
3939

4040
# Modified UTF-8 parser
4141
from .modifiedutf8 import byte_to_int, decode_modified_utf8

‎javaobj/v1/__init__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
55
:authors: Thomas Calmant
66
:license: Apache License 2.0
7-
:version: 0.4.4
7+
:version: 0.5.0
88
:status: Alpha
99
1010
..
1111
12-
Copyright 2024 Thomas Calmant
12+
Copyright 2026 Thomas Calmant
1313
1414
Licensed under the Apache License, Version 2.0 (the "License");
1515
you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
2626

2727
from . import beans, core, transformers # noqa: F401
2828
from .core import ( # noqa: F401
29-
load,
30-
loads,
31-
dumps,
3229
JavaObjectMarshaller,
3330
JavaObjectUnmarshaller,
31+
dumps,
32+
load,
33+
loads,
3434
)
3535
from .transformers import DefaultObjectTransformer # noqa: F401
3636

‎javaobj/v1/beans.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
66
:authors: Volodymyr Buell, Thomas Calmant
77
:license: Apache License 2.0
8-
:version: 0.4.4
8+
:version: 0.5.0
99
:status: Alpha
1010
1111
..
1212
13-
Copyright 2024 Thomas Calmant
13+
Copyright 2026 Thomas Calmant
1414
1515
Licensed under the Apache License, Version 2.0 (the "License");
1616
you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
2727

2828
from __future__ import absolute_import
2929

30-
from typing import List
3130
import struct
31+
from typing import List # noqa: F401
3232

3333
from ..utils import UNICODE_TYPE
3434

@@ -62,12 +62,12 @@ def __init__(self):
6262
"""
6363
Sets up members
6464
"""
65-
self.name = None # type: str
66-
self.serialVersionUID = None # type: int # pylint:disable=C0103
67-
self.flags = None # type: int
65+
self.name = None # type: str | None
66+
self.serialVersionUID = None # type: int | None # pylint:disable=C0103
67+
self.flags = None # type: int | None
6868
self.fields_names = [] # type: List[str]
6969
self.fields_types = [] # type: List[JavaString]
70-
self.superclass = None # type: JavaClass
70+
self.superclass = None # type: JavaClass | None
7171

7272
def __str__(self):
7373
"""
@@ -110,7 +110,7 @@ def __init__(self):
110110
"""
111111
Sets up members
112112
"""
113-
self.classdesc = None # type: JavaClass
113+
self.classdesc = None # type: JavaClass | None
114114
self.annotations = []
115115

116116
def get_class(self):

‎javaobj/v1/core.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
1414
:authors: Volodymyr Buell, Thomas Calmant
1515
:license: Apache License 2.0
16-
:version: 0.4.4
16+
:version: 0.5.0
1717
:status: Alpha
1818
1919
..
2020
21-
Copyright 2024 Thomas Calmant
21+
Copyright 2026 Thomas Calmant
2222
2323
Licensed under the Apache License, Version 2.0 (the "License");
2424
you may not use this file except in compliance with the License.
@@ -44,10 +44,10 @@
4444
from io import BytesIO
4545

4646
# Javaobj modules
47+
from ..utils import java_data_fd
4748
from .marshaller import JavaObjectMarshaller
48-
from .unmarshaller import JavaObjectUnmarshaller
4949
from .transformers import DefaultObjectTransformer
50-
from ..utils import java_data_fd
50+
from .unmarshaller import JavaObjectUnmarshaller
5151

5252
# ------------------------------------------------------------------------------
5353

‎javaobj/v1/marshaller.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
1414
:authors: Volodymyr Buell, Thomas Calmant
1515
:license: Apache License 2.0
16-
:version: 0.4.4
16+
:version: 0.5.0
1717
:status: Alpha
1818
1919
..
2020
21-
Copyright 2024 Thomas Calmant
21+
Copyright 2026 Thomas Calmant
2222
2323
Licensed under the Apache License, Version 2.0 (the "License");
2424
you may not use this file except in compliance with the License.
@@ -48,26 +48,26 @@
4848
from io import BytesIO
4949

5050
# Javaobj modules
51-
from .beans import (
52-
JavaClass,
53-
JavaString,
54-
JavaObject,
55-
JavaByteArray,
56-
JavaEnum,
57-
JavaArray,
58-
)
5951
from ..constants import (
60-
StreamConstants,
6152
ClassDescFlags,
53+
StreamConstants,
6254
TerminalCode,
6355
TypeCode,
6456
)
6557
from ..utils import (
58+
BYTES_TYPE,
59+
UNICODE_TYPE,
6660
log_debug,
6761
log_error,
6862
to_bytes,
69-
BYTES_TYPE,
70-
UNICODE_TYPE,
63+
)
64+
from .beans import (
65+
JavaArray,
66+
JavaByteArray,
67+
JavaClass,
68+
JavaEnum,
69+
JavaObject,
70+
JavaString,
7171
)
7272

7373
# ------------------------------------------------------------------------------

‎javaobj/v1/transformers.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
66
:authors: Volodymyr Buell, Thomas Calmant
77
:license: Apache License 2.0
8-
:version: 0.4.4
8+
:version: 0.5.0
99
:status: Alpha
1010
1111
..
1212
13-
Copyright 2024 Thomas Calmant
13+
Copyright 2026 Thomas Calmant
1414
1515
Licensed under the Apache License, Version 2.0 (the "License");
1616
you may not use this file except in compliance with the License.
@@ -27,20 +27,19 @@
2727

2828
from __future__ import absolute_import
2929

30-
from typing import Callable, Dict
3130
import functools
31+
from typing import Callable, Dict # noqa: F401
3232

33-
from .beans import JavaClass, JavaObject
34-
from .unmarshaller import JavaObjectUnmarshaller
3533
from ..constants import ClassDescFlags, TerminalCode, TypeCode
3634
from ..utils import (
3735
log_debug,
3836
log_error,
39-
to_bytes,
40-
read_struct,
4137
read_string,
38+
read_struct,
39+
to_bytes,
4240
)
43-
41+
from .beans import JavaClass, JavaObject
42+
from .unmarshaller import JavaObjectUnmarshaller
4443

4544
__all__ = ("DefaultObjectTransformer",)
4645

‎javaobj/v1/unmarshaller.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
1414
:authors: Volodymyr Buell, Thomas Calmant
1515
:license: Apache License 2.0
16-
:version: 0.4.4
16+
:version: 0.5.0
1717
:status: Alpha
1818
1919
..
2020
21-
Copyright 2024 Thomas Calmant
21+
Copyright 2026 Thomas Calmant
2222
2323
Licensed under the Apache License, Version 2.0 (the "License");
2424
you may not use this file except in compliance with the License.
@@ -35,34 +35,35 @@
3535

3636
from __future__ import absolute_import
3737

38-
# Standard library
39-
from typing import Any, Union
40-
import os
4138
import struct
4239

43-
# Javaobj modules
44-
from .beans import (
45-
JavaClass,
46-
JavaString,
47-
JavaObject,
48-
JavaByteArray,
49-
JavaEnum,
50-
JavaArray,
51-
)
40+
# Standard library
41+
from typing import Any, Union # noqa: F401
42+
5243
from ..constants import (
53-
StreamConstants,
5444
ClassDescFlags,
45+
StreamCodeDebug,
46+
StreamConstants,
5547
TerminalCode,
5648
TypeCode,
57-
StreamCodeDebug,
5849
)
5950
from ..utils import (
51+
hexdump,
6052
log_debug,
6153
log_error,
6254
read_to_str,
6355
to_unicode,
6456
unicode_char,
65-
hexdump,
57+
)
58+
59+
# Javaobj modules
60+
from .beans import (
61+
JavaArray,
62+
JavaByteArray,
63+
JavaClass,
64+
JavaEnum,
65+
JavaObject,
66+
JavaString,
6667
)
6768

6869
numpy = None # Imported only when really used

0 commit comments

Comments
 (0)