Skip to content

Commit 6aacf72

Browse files
tcalmanttcalmant
committed
Format with ruff
Signed-off-by: Thomas Calmant <thomas.calmant@gmail.com>
1 parent 68eeb66 commit 6aacf72

2 files changed

Lines changed: 68 additions & 96 deletions

File tree

‎tests/test_v1.py‎

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ def read_file(self, filename, stream=False):
8585
:return: File content or stream
8686
"""
8787
for subfolder in ("java", ""):
88-
found_file = os.path.join(
89-
os.path.dirname(__file__), subfolder, filename
90-
)
88+
found_file = os.path.join(os.path.dirname(__file__), subfolder, filename)
9189
if os.path.exists(found_file):
9290
break
9391
else:
@@ -148,14 +146,10 @@ def test_gzip_open(self):
148146
with java_data_fd(self.read_file("testChars.ser", stream=True)) as fd:
149147
base = fd.read()
150148

151-
with java_data_fd(
152-
self.read_file("testChars.ser.gz", stream=True)
153-
) as fd:
149+
with java_data_fd(self.read_file("testChars.ser.gz", stream=True)) as fd:
154150
gzipped = fd.read()
155151

156-
self.assertEqual(
157-
base, gzipped, "Uncompressed content doesn't match the original"
158-
)
152+
self.assertEqual(base, gzipped, "Uncompressed content doesn't match the original")
159153

160154
def test_chars_gzip(self):
161155
"""
@@ -238,7 +232,7 @@ def test_fields(self):
238232
pobj = javaobj.loads(jobj)
239233
_logger.debug("Read object: %s", pobj)
240234

241-
self.assertEqual(pobj.aField1, u"Gabba")
235+
self.assertEqual(pobj.aField1, "Gabba")
242236
self.assertEqual(pobj.aField2, None)
243237

244238
classdesc = pobj.get_class()
@@ -290,10 +284,10 @@ def test_super(self):
290284
_logger.debug(classdesc.fields_names)
291285
_logger.debug(classdesc.fields_types)
292286

293-
self.assertEqual(pobj.childString, u"Child!!")
287+
self.assertEqual(pobj.childString, "Child!!")
294288
self.assertEqual(pobj.bool, True)
295289
self.assertEqual(pobj.integer, -1)
296-
self.assertEqual(pobj.superString, u"Super!!")
290+
self.assertEqual(pobj.superString, "Super!!")
297291

298292
self._try_marshalling(jobj, pobj)
299293

@@ -333,9 +327,7 @@ def test_japan(self):
333327
pobj = javaobj.loads(jobj)
334328
_logger.debug(pobj)
335329
# Compare the UTF-8 encoded version of the name
336-
self.assertEqual(
337-
pobj, b"\xe6\x97\xa5\xe6\x9c\xac\xe5\x9b\xbd".decode("utf-8")
338-
)
330+
self.assertEqual(pobj, b"\xe6\x97\xa5\xe6\x9c\xac\xe5\x9b\xbd".decode("utf-8"))
339331
self._try_marshalling(jobj, pobj)
340332

341333
def test_char_array(self):
@@ -348,13 +340,13 @@ def test_char_array(self):
348340
self.assertEqual(
349341
pobj,
350342
[
351-
u"\u0000",
352-
u"\ud800",
353-
u"\u0001",
354-
u"\udc00",
355-
u"\u0002",
356-
u"\uffff",
357-
u"\u0003",
343+
"\u0000",
344+
"\ud800",
345+
"\u0001",
346+
"\udc00",
347+
"\u0002",
348+
"\uffff",
349+
"\u0003",
358350
],
359351
)
360352
self._try_marshalling(jobj, pobj)
@@ -367,7 +359,11 @@ def test_2d_array(self):
367359
pobj = javaobj.loads(jobj)
368360
_logger.debug(pobj)
369361
self.assertEqual(
370-
pobj, [[1, 2, 3], [4, 5, 6],],
362+
pobj,
363+
[
364+
[1, 2, 3],
365+
[4, 5, 6],
366+
],
371367
)
372368

373369
def test_enums(self):
@@ -385,9 +381,9 @@ def test_enums(self):
385381

386382
self.assertEqual(classdesc.name, "ClassWithEnum")
387383
self.assertEqual(pobj.color.classdesc.name, "Color")
388-
self.assertEqual(pobj.color.constant, u"GREEN")
384+
self.assertEqual(pobj.color.constant, "GREEN")
389385

390-
for color, intended in zip(pobj.colors, (u"GREEN", u"BLUE", u"RED")):
386+
for color, intended in zip(pobj.colors, ("GREEN", "BLUE", "RED")):
391387
self.assertEqual(color.classdesc.name, "Color")
392388
self.assertEqual(color.constant, intended)
393389

@@ -424,9 +420,7 @@ def test_times(self):
424420
# Check types
425421
self.assertIsInstance(pobj, javaobj.beans.JavaArray)
426422
for obj in pobj:
427-
self.assertIsInstance(
428-
obj, javaobj.DefaultObjectTransformer.JavaTime
429-
)
423+
self.assertIsInstance(obj, javaobj.DefaultObjectTransformer.JavaTime)
430424

431425
# def test_exception(self):
432426
# jobj = self.read_file("objException.ser")
@@ -442,9 +436,7 @@ def test_times(self):
442436
# self.assertEqual(classdesc.name, "MyExceptionWhenDumping")
443437

444438
def test_sun_example(self):
445-
marshaller = javaobj.JavaObjectUnmarshaller(
446-
self.read_file("sunExample.ser", stream=True)
447-
)
439+
marshaller = javaobj.JavaObjectUnmarshaller(self.read_file("sunExample.ser", stream=True))
448440
pobj = marshaller.readObject()
449441

450442
self.assertEqual(pobj.value, 17)
@@ -492,19 +484,19 @@ def test_qistoph_pr_27(self):
492484
_logger.debug(pobj)
493485

494486
# Basic checking
495-
self.assertEqual(pobj[u"key1"], u"value1")
496-
self.assertEqual(pobj[u"key2"], u"value2")
497-
self.assertEqual(pobj[u"int"], 9)
498-
self.assertEqual(pobj[u"int2"], 10)
499-
self.assertEqual(pobj[u"bool"], True)
500-
self.assertEqual(pobj[u"bool2"], True)
487+
self.assertEqual(pobj["key1"], "value1")
488+
self.assertEqual(pobj["key2"], "value2")
489+
self.assertEqual(pobj["int"], 9)
490+
self.assertEqual(pobj["int2"], 10)
491+
self.assertEqual(pobj["bool"], True)
492+
self.assertEqual(pobj["bool2"], True)
501493

502494
# Load the parent map
503495
jobj2 = self.read_file("testBoolIntLong-2.ser")
504496
pobj2 = javaobj.loads(jobj2)
505497
_logger.debug(pobj2)
506498

507-
parent_map = pobj2[u"subMap"]
499+
parent_map = pobj2["subMap"]
508500
for key, value in pobj.items():
509501
self.assertEqual(parent_map[key], value)
510502

‎tests/test_v2.py‎

Lines changed: 38 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757

5858
# ------------------------------------------------------------------------------
5959

60+
6061
# Custom writeObject parsing classes
6162
class CustomWriterInstance(javaobj.beans.JavaInstance):
6263
def __init__(self):
@@ -71,9 +72,7 @@ def load_from_instance(self):
7172
if self.classdesc and self.classdesc in self.annotations:
7273
fields = ["int_not_in_fields"] + self.classdesc.fields_names
7374
raw_data = self.annotations[self.classdesc]
74-
int_not_in_fields = struct.unpack(
75-
">i", BytesIO(raw_data[0].data).read(4)
76-
)[0]
75+
int_not_in_fields = struct.unpack(">i", BytesIO(raw_data[0].data).read(4))[0]
7776
custom_obj = raw_data[1]
7877
values = [int_not_in_fields, custom_obj]
7978
self.field_data = dict(zip(fields, values))
@@ -91,19 +90,11 @@ def load_from_instance(self):
9190
"""
9291
if self.classdesc and self.classdesc in self.field_data:
9392
fields = self.classdesc.fields_names
94-
values = [
95-
self.field_data[self.classdesc][self.classdesc.fields[i]]
96-
for i in range(len(fields))
97-
]
93+
values = [self.field_data[self.classdesc][self.classdesc.fields[i]] for i in range(len(fields))]
9894
self.field_data = dict(zip(fields, values))
99-
if (
100-
self.classdesc.super_class
101-
and self.classdesc.super_class in self.annotations
102-
):
95+
if self.classdesc.super_class and self.classdesc.super_class in self.annotations:
10396
super_class = self.annotations[self.classdesc.super_class][0]
104-
self.annotations = dict(
105-
zip(super_class.fields_names, super_class.field_data)
106-
)
97+
self.annotations = dict(zip(super_class.fields_names, super_class.field_data))
10798
return True
10899

109100
return False
@@ -135,16 +126,12 @@ def create_instance(self, classdesc):
135126

136127
class RandomChildTransformer(BaseTransformer):
137128
def __init__(self):
138-
super(RandomChildTransformer, self).__init__(
139-
{"RandomChild": RandomChildInstance}
140-
)
129+
super(RandomChildTransformer, self).__init__({"RandomChild": RandomChildInstance})
141130

142131

143132
class CustomWriterTransformer(BaseTransformer):
144133
def __init__(self):
145-
super(CustomWriterTransformer, self).__init__(
146-
{"CustomWriter": CustomWriterInstance}
147-
)
134+
super(CustomWriterTransformer, self).__init__({"CustomWriter": CustomWriterInstance})
148135

149136

150137
class JavaRandomTransformer(BaseTransformer):
@@ -168,9 +155,7 @@ def load_custom_writeObject(self, parser, reader, name):
168155
values.append(parser._read_field_value(f_type))
169156
fields.append(javaobj.beans.JavaField(f_type, f_name))
170157

171-
class_desc = javaobj.beans.JavaClassDesc(
172-
javaobj.beans.ClassDescType.NORMALCLASS
173-
)
158+
class_desc = javaobj.beans.JavaClassDesc(javaobj.beans.ClassDescType.NORMALCLASS)
174159
class_desc.name = self.name
175160
class_desc.desc_flags = javaobj.beans.ClassDataType.EXTERNAL_CONTENTS
176161
class_desc.fields = fields
@@ -211,9 +196,7 @@ def read_file(self, filename, stream=False):
211196
:return: File content or stream
212197
"""
213198
for subfolder in ("java", ""):
214-
found_file = os.path.join(
215-
os.path.dirname(__file__), subfolder, filename
216-
)
199+
found_file = os.path.join(os.path.dirname(__file__), subfolder, filename)
217200
if os.path.exists(found_file):
218201
break
219202
else:
@@ -254,14 +237,10 @@ def test_gzip_open(self):
254237
with java_data_fd(self.read_file("testChars.ser", stream=True)) as fd:
255238
base = fd.read()
256239

257-
with java_data_fd(
258-
self.read_file("testChars.ser.gz", stream=True)
259-
) as fd:
240+
with java_data_fd(self.read_file("testChars.ser.gz", stream=True)) as fd:
260241
gzipped = fd.read()
261242

262-
self.assertEqual(
263-
base, gzipped, "Uncompressed content doesn't match the original"
264-
)
243+
self.assertEqual(base, gzipped, "Uncompressed content doesn't match the original")
265244

266245
def test_chars_gzip(self):
267246
"""
@@ -340,7 +319,7 @@ def test_fields(self):
340319
pobj = javaobj.loads(jobj)
341320
_logger.debug("Read object: %s", pobj)
342321

343-
self.assertEqual(pobj.aField1, u"Gabba")
322+
self.assertEqual(pobj.aField1, "Gabba")
344323
self.assertEqual(pobj.aField2, None)
345324

346325
classdesc = pobj.get_class()
@@ -390,10 +369,10 @@ def test_super(self):
390369
_logger.debug(classdesc.fields_names)
391370
_logger.debug(classdesc.fields_types)
392371

393-
self.assertEqual(pobj.childString, u"Child!!")
372+
self.assertEqual(pobj.childString, "Child!!")
394373
self.assertEqual(pobj.bool, True)
395374
self.assertEqual(pobj.integer, -1)
396-
self.assertEqual(pobj.superString, u"Super!!")
375+
self.assertEqual(pobj.superString, "Super!!")
397376

398377
def test_arrays(self):
399378
"""
@@ -429,9 +408,7 @@ def test_japan(self):
429408
pobj = javaobj.loads(jobj)
430409
_logger.debug(pobj)
431410
# Compare the UTF-8 encoded version of the name
432-
self.assertEqual(
433-
pobj, b"\xe6\x97\xa5\xe6\x9c\xac\xe5\x9b\xbd".decode("utf-8")
434-
)
411+
self.assertEqual(pobj, b"\xe6\x97\xa5\xe6\x9c\xac\xe5\x9b\xbd".decode("utf-8"))
435412

436413
def test_char_array(self):
437414
"""
@@ -443,13 +420,13 @@ def test_char_array(self):
443420
self.assertEqual(
444421
pobj,
445422
[
446-
u"\u0000",
447-
u"\ud800",
448-
u"\u0001",
449-
u"\udc00",
450-
u"\u0002",
451-
u"\uffff",
452-
u"\u0003",
423+
"\u0000",
424+
"\ud800",
425+
"\u0001",
426+
"\udc00",
427+
"\u0002",
428+
"\uffff",
429+
"\u0003",
453430
],
454431
)
455432

@@ -461,7 +438,11 @@ def test_2d_array(self):
461438
pobj = javaobj.loads(jobj)
462439
_logger.debug(pobj)
463440
self.assertEqual(
464-
pobj, [[1, 2, 3], [4, 5, 6],],
441+
pobj,
442+
[
443+
[1, 2, 3],
444+
[4, 5, 6],
445+
],
465446
)
466447

467448
def test_class_array(self):
@@ -489,9 +470,9 @@ def test_enums(self):
489470

490471
self.assertEqual(classdesc.name, "ClassWithEnum")
491472
self.assertEqual(pobj.color.classdesc.name, "Color")
492-
self.assertEqual(pobj.color.constant, u"GREEN")
473+
self.assertEqual(pobj.color.constant, "GREEN")
493474

494-
for color, intended in zip(pobj.colors, (u"GREEN", u"BLUE", u"RED")):
475+
for color, intended in zip(pobj.colors, ("GREEN", "BLUE", "RED")):
495476
_logger.debug("color: {0} - {1}".format(color, type(color)))
496477
self.assertEqual(color.classdesc.name, "Color")
497478
self.assertEqual(color.constant, intended)
@@ -588,19 +569,19 @@ def test_qistoph_pr_27(self):
588569
_logger.debug(pobj)
589570

590571
# Basic checking
591-
self.assertEqual(pobj[u"key1"], u"value1")
592-
self.assertEqual(pobj[u"key2"], u"value2")
593-
self.assertEqual(pobj[u"int"], 9)
594-
self.assertEqual(pobj[u"int2"], 10)
595-
self.assertEqual(pobj[u"bool"], True)
596-
self.assertEqual(pobj[u"bool2"], True)
572+
self.assertEqual(pobj["key1"], "value1")
573+
self.assertEqual(pobj["key2"], "value2")
574+
self.assertEqual(pobj["int"], 9)
575+
self.assertEqual(pobj["int2"], 10)
576+
self.assertEqual(pobj["bool"], True)
577+
self.assertEqual(pobj["bool2"], True)
597578

598579
# Load the parent map
599580
jobj2 = self.read_file("testBoolIntLong-2.ser")
600581
pobj2 = javaobj.loads(jobj2)
601582
_logger.debug(pobj2)
602583

603-
parent_map = pobj2[u"subMap"]
584+
parent_map = pobj2["subMap"]
604585
for key, value in pobj.items():
605586
self.assertEqual(parent_map[key], value)
606587

@@ -638,12 +619,11 @@ def test_writeObject(self):
638619
},
639620
}
640621

641-
self.assertEqual(
642-
expected["int_not_in_fields"], parent_data["int_not_in_fields"]
643-
)
622+
self.assertEqual(expected["int_not_in_fields"], parent_data["int_not_in_fields"])
644623
self.assertEqual(expected["custom_obj"]["field_data"], child_data)
645624
self.assertEqual(expected["custom_obj"]["annotations"], super_data)
646625

626+
647627
# ------------------------------------------------------------------------------
648628

649629

0 commit comments

Comments
 (0)