From 4611bcdd3665cdcd2a11bd5e95d2db1f5dcac25d Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Sat, 13 Aug 2016 12:55:35 +0100 Subject: [PATCH] Fix rebasing problems in example-python-types --- example/example-python-types.py | 10 +++++----- example/example-python-types.ref | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/example/example-python-types.py b/example/example-python-types.py index f743d8830..19df02ebd 100755 --- a/example/example-python-types.py +++ b/example/example-python-types.py @@ -66,14 +66,14 @@ print("__module__(example.ExamplePythonTypes) = %s" % ExamplePythonTypes.__modul print("__name__(example.ExamplePythonTypes.get_set) = %s" % ExamplePythonTypes.get_set.__name__) print("__module__(example.ExamplePythonTypes.get_set) = %s" % ExamplePythonTypes.get_set.__module__) +print(instance.get_bytes_from_string().decode()) +print(instance.get_bytes_from_str().decode()) +print(instance.get_str_from_string()) +print(instance.get_str_from_bytes()) + from example import ConstructorStats cstats = ConstructorStats.get(ExamplePythonTypes) print("Instances not destroyed:", cstats.alive()) instance = None print("Instances not destroyed:", cstats.alive()) - -print(instance.get_bytes_from_string().decode()) -print(instance.get_bytes_from_str().decode()) -print(instance.get_str_from_string()) -print(instance.get_str_from_bytes()) diff --git a/example/example-python-types.ref b/example/example-python-types.ref index 6768d714e..ab89d7eb5 100644 --- a/example/example-python-types.ref +++ b/example/example-python-types.ref @@ -135,11 +135,10 @@ __name__(example.ExamplePythonTypes) = ExamplePythonTypes __module__(example.ExamplePythonTypes) = example __name__(example.ExamplePythonTypes.get_set) = get_set __module__(example.ExamplePythonTypes.get_set) = example -Instances not destroyed: 1 -### ExamplePythonTypes @ 0x1045b80 destroyed -Instances not destroyed: 0 -Destructing ExamplePythonTypes foo bar baz boo +Instances not destroyed: 1 +### ExamplePythonTypes @ 0x1045b80 destroyed +Instances not destroyed: 0