From d02f24ae74134bd7383718182b43c1d711d78a3b Mon Sep 17 00:00:00 2001 From: Emmanuel Leblond Date: Tue, 1 May 2018 11:41:56 +0200 Subject: [PATCH] Fix style due to new black version --- pythonscript/embedded/godot/hazmat/ffi/editor.py | 4 +++- pythonscript/embedded/godot/hazmat/ffi/script.py | 4 +++- pythonscript/embedded/godot/hazmat/tools.py | 8 ++++++-- tests/bindings/test_dictionary.py | 10 +++++----- tests/bindings/test_dynamic_bindings.py | 11 ++++++++++- tests/bindings/test_memory_leaks.py | 16 +++++++++++----- tests/bindings/test_pool_arrays.py | 1 - tools/multi_platform_release.py | 2 +- 8 files changed, 39 insertions(+), 17 deletions(-) diff --git a/pythonscript/embedded/godot/hazmat/ffi/editor.py b/pythonscript/embedded/godot/hazmat/ffi/editor.py index d8df021b..603d5f04 100644 --- a/pythonscript/embedded/godot/hazmat/ffi/editor.py +++ b/pythonscript/embedded/godot/hazmat/ffi/editor.py @@ -1,7 +1,9 @@ from pythonscriptcffi import ffi, lib from godot.hazmat.tools import ( - godot_string_to_pyobj, godot_string_from_pyobj_for_ffi_return, variant_to_pyobj + godot_string_to_pyobj, + godot_string_from_pyobj_for_ffi_return, + variant_to_pyobj, ) from godot.bindings import PoolStringArray import godot.globals diff --git a/pythonscript/embedded/godot/hazmat/ffi/script.py b/pythonscript/embedded/godot/hazmat/ffi/script.py index 5f7beca4..c2202893 100644 --- a/pythonscript/embedded/godot/hazmat/ffi/script.py +++ b/pythonscript/embedded/godot/hazmat/ffi/script.py @@ -6,7 +6,9 @@ from godot.hazmat.base import BaseObject, get_exposed_class_per_module from godot.hazmat.gc_protector import connect_handle from godot.hazmat.tools import ( - godot_string_to_pyobj, godot_string_from_pyobj, py_to_gd_type + godot_string_to_pyobj, + godot_string_from_pyobj, + py_to_gd_type, ) from godot.bindings import Dictionary, Array diff --git a/pythonscript/embedded/godot/hazmat/tools.py b/pythonscript/embedded/godot/hazmat/tools.py index 90cd61f7..93b8bcf3 100644 --- a/pythonscript/embedded/godot/hazmat/tools.py +++ b/pythonscript/embedded/godot/hazmat/tools.py @@ -178,12 +178,16 @@ def variant_to_pyobj(p_gdvar): elif gdtype == lib.GODOT_VARIANT_TYPE_POOL_VECTOR2_ARRAY: p_raw = godot_pool_vector2_array_alloc(initialized=False) p_raw[0] = lib.godot_variant_as_pool_vector2_array(p_gdvar) - return godot_bindings_module.PoolVector2Array.build_from_gdobj(p_raw, steal=True) + return godot_bindings_module.PoolVector2Array.build_from_gdobj( + p_raw, steal=True + ) elif gdtype == lib.GODOT_VARIANT_TYPE_POOL_VECTOR3_ARRAY: p_raw = godot_pool_vector3_array_alloc(initialized=False) p_raw[0] = lib.godot_variant_as_pool_vector3_array(p_gdvar) - return godot_bindings_module.PoolVector3Array.build_from_gdobj(p_raw, steal=True) + return godot_bindings_module.PoolVector3Array.build_from_gdobj( + p_raw, steal=True + ) elif gdtype == lib.GODOT_VARIANT_TYPE_POOL_COLOR_ARRAY: p_raw = godot_pool_color_array_alloc(initialized=False) diff --git a/tests/bindings/test_dictionary.py b/tests/bindings/test_dictionary.py index d0d4a8de..5b656438 100644 --- a/tests/bindings/test_dictionary.py +++ b/tests/bindings/test_dictionary.py @@ -103,11 +103,11 @@ def test_delitem(self): del v[object()] def test_update(self): - v = Dictionary({'a': 1, 'b': 2, 'c': 3}) - v.update({'a': 'one', 'd': 'four'}) - v.update(Dictionary({'b': 'two', 'e': 'five'})) - assert set(v.keys()) == {'a', 'b', 'c', 'd', 'e'} - assert set(v.values()) == {'one', 'two', 3, 'four', 'five'} + v = Dictionary({"a": 1, "b": 2, "c": 3}) + v.update({"a": "one", "d": "four"}) + v.update(Dictionary({"b": "two", "e": "five"})) + assert set(v.keys()) == {"a", "b", "c", "d", "e"} + assert set(v.values()) == {"one", "two", 3, "four", "five"} def test_contains(self): v = Dictionary({"a": 1, 2: "foo", 0.5: Vector2()}) diff --git a/tests/bindings/test_dynamic_bindings.py b/tests/bindings/test_dynamic_bindings.py index ad7b4fa4..21b87dd0 100644 --- a/tests/bindings/test_dynamic_bindings.py +++ b/tests/bindings/test_dynamic_bindings.py @@ -1,7 +1,16 @@ import pytest from godot.bindings import ( - Object, Node, Viewport, Input, LineEdit, Engine, _Engine, KEY_ESCAPE, OK, FAILED + Object, + Node, + Viewport, + Input, + LineEdit, + Engine, + _Engine, + KEY_ESCAPE, + OK, + FAILED, ) diff --git a/tests/bindings/test_memory_leaks.py b/tests/bindings/test_memory_leaks.py index b1d7f0f0..cccbd881 100644 --- a/tests/bindings/test_memory_leaks.py +++ b/tests/bindings/test_memory_leaks.py @@ -42,6 +42,7 @@ def test_base_dynamic_memory_leak_check(): def test_base_builtin_memory_leak(): + def fn(): v = bindings.Vector3() v.x = 42 @@ -51,21 +52,23 @@ def fn(): def test_dictionary_memory_leak(): + def fn(): v = bindings.Dictionary() - v['foo'] = OS - v.update({'a': 1, 'b': 2.0, 'c': 'three'}) - v['foo'] + v["foo"] = OS + v.update({"a": 1, "b": 2.0, "c": "three"}) + v["foo"] [x for x in v.items()] - del v['a'] + del v["a"] check_memory_leak(fn) def test_array_memory_leak(): + def fn(): v = bindings.Array() - v.append('x') + v.append("x") v += [1, 2, 3] v[0] [x for x in v] @@ -74,6 +77,7 @@ def fn(): def test_pool_int_array_memory_leak(): + def fn(): v = bindings.PoolIntArray() v.append(42) @@ -84,6 +88,7 @@ def fn(): def test_pool_string_array_memory_leak(): + def fn(): v = bindings.PoolStringArray() v.append("fooo") @@ -94,6 +99,7 @@ def fn(): def test_object_memory_leak(): + def fn(): v = bindings.Node() v.free() diff --git a/tests/bindings/test_pool_arrays.py b/tests/bindings/test_pool_arrays.py index e33dcc13..6198ac7f 100644 --- a/tests/bindings/test_pool_arrays.py +++ b/tests/bindings/test_pool_arrays.py @@ -90,7 +90,6 @@ def test_add_with_non_PoolBytearray(self): arr4 = [values[0]] + list(pba) assert arr4 == values - @pytest.mark.parametrize("arg", [None, 0, "foo", Vector2(), Node()]) def test_bad_add(self, arg): with pytest.raises(TypeError): diff --git a/tools/multi_platform_release.py b/tools/multi_platform_release.py index dff47879..8032ef36 100755 --- a/tools/multi_platform_release.py +++ b/tools/multi_platform_release.py @@ -33,7 +33,7 @@ def fetch_build(src, version, target): urlretrieve( url, filename=build_zipname, - reporthook=lambda *args: print(".", end="", flush=True) + reporthook=lambda *args: print(".", end="", flush=True), ) return ZipFile(cache_file)