From e64bffe0307d14204b00a177a472cd4f99c07561 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 12 May 2016 15:27:50 +0200 Subject: python: Add a test suite. * configure.ac: Add new Makefile. * lang/python/Makefile.am: Add subdirectory. * lang/python/tests/Makefile.am: New file. * lang/python/tests/t-wrapper.py: Likewise. Signed-off-by: Justus Winter --- lang/python/tests/t-wrapper.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 lang/python/tests/t-wrapper.py (limited to 'lang/python/tests/t-wrapper.py') diff --git a/lang/python/tests/t-wrapper.py b/lang/python/tests/t-wrapper.py new file mode 100755 index 00000000..acc2ecfd --- /dev/null +++ b/lang/python/tests/t-wrapper.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 + +# Copyright (C) 2016 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# GPGME is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +# Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, see . + +from pyme import core + +d0 = core.Data() +assert d0.seek == d0.seek, "Generated wrapper functions are not cached" -- cgit From 11314f0db6e57597e3f56351a86fdb36a7a17dd7 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 12 May 2016 18:29:04 +0200 Subject: python: Share generated methods between objects. * lang/python/pyme/util.py (GpgmeWrapper.__getattr__): Monkey-patch the class. * lang/python/tests/t-wrapper.py: Demonstrate the sharing. Signed-off-by: Justus Winter --- lang/python/pyme/util.py | 26 ++++++++++++++++---------- lang/python/tests/t-wrapper.py | 2 ++ 2 files changed, 18 insertions(+), 10 deletions(-) (limited to 'lang/python/tests/t-wrapper.py') diff --git a/lang/python/pyme/util.py b/lang/python/pyme/util.py index a8560992..a9fa19d2 100644 --- a/lang/python/pyme/util.py +++ b/lang/python/pyme/util.py @@ -74,19 +74,25 @@ class GpgmeWrapper(object): if key[0] == '_' or self._getnameprepend() == None: return None name = self._getnameprepend() + key + func = getattr(pygpgme, name) + if self._errorcheck(name): - def _funcwrap(*args, **kwargs): - args = [self.wrapped] + list(args) - return errorcheck(getattr(pygpgme, name)(*args, **kwargs), + def _funcwrap(slf, *args, **kwargs): + return errorcheck(func(slf.wrapped, *args, **kwargs), "Invocation of " + name) else: - def _funcwrap(*args, **kwargs): - args = [self.wrapped] + list(args) - return getattr(pygpgme, name)(*args, **kwargs) + def _funcwrap(slf, *args, **kwargs): + return func(slf.wrapped, *args, **kwargs) + + _funcwrap.__doc__ = getattr(func, "__doc__") + + # Monkey-patch the class. + setattr(self.__class__, key, _funcwrap) - _funcwrap.__doc__ = getattr(getattr(pygpgme, name), "__doc__") + # Bind the method to 'self'. + def wrapper(*args, **kwargs): + return _funcwrap(self, *args, **kwargs) + _funcwrap.__doc__ = getattr(func, "__doc__") - # Cache the wrapper function. - setattr(self, key, _funcwrap) - return _funcwrap + return wrapper diff --git a/lang/python/tests/t-wrapper.py b/lang/python/tests/t-wrapper.py index acc2ecfd..fab0d811 100755 --- a/lang/python/tests/t-wrapper.py +++ b/lang/python/tests/t-wrapper.py @@ -20,4 +20,6 @@ from pyme import core d0 = core.Data() +d0.seek # trigger on-demand-wrapping assert d0.seek == d0.seek, "Generated wrapper functions are not cached" +assert hasattr(core.Data, 'seek'), "Generated wrapper functions are not shared" -- cgit