diff options
author | Daniel Kahn Gillmor <[email protected]> | 2016-10-28 20:45:49 +0000 |
---|---|---|
committer | Justus Winter <[email protected]> | 2016-10-31 14:42:27 +0000 |
commit | 2fac017618a76882605125b05ff1f7393fe99860 (patch) | |
tree | b7eddc17682b6aa91b8c3c723a2fc02f28ac0a6c /lang/python/gpg | |
parent | core: New API functions gpgme_set_sender, gpgme_get_sender. (diff) | |
download | gpgme-2fac017618a76882605125b05ff1f7393fe99860.tar.gz gpgme-2fac017618a76882605125b05ff1f7393fe99860.zip |
python: Rename Python module from PyME to gpg.
This follows weeks of discussion on the gnupg-devel mailing list.
Hopefully it will make it easier for people using Python to use GnuPG
in the future.
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | lang/python/gpg/__init__.py (renamed from lang/python/pyme/__init__.py) | 24 | ||||
-rw-r--r-- | lang/python/gpg/callbacks.py (renamed from lang/python/pyme/callbacks.py) | 0 | ||||
-rw-r--r-- | lang/python/gpg/constants/__init__.py (renamed from lang/python/pyme/constants/__init__.py) | 4 | ||||
-rw-r--r-- | lang/python/gpg/constants/data/__init__.py (renamed from lang/python/pyme/constants/data/__init__.py) | 0 | ||||
-rw-r--r-- | lang/python/gpg/constants/data/encoding.py (renamed from lang/python/pyme/constants/data/encoding.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/event.py (renamed from lang/python/pyme/constants/event.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/import.py (renamed from lang/python/pyme/constants/import.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/keylist/__init__.py (renamed from lang/python/pyme/constants/keylist/__init__.py) | 0 | ||||
-rw-r--r-- | lang/python/gpg/constants/keylist/mode.py (renamed from lang/python/pyme/constants/keylist/mode.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/md.py (renamed from lang/python/pyme/constants/md.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/pk.py (renamed from lang/python/pyme/constants/pk.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/protocol.py (renamed from lang/python/pyme/constants/protocol.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/sig/__init__.py (renamed from lang/python/pyme/constants/sig/__init__.py) | 0 | ||||
-rw-r--r-- | lang/python/gpg/constants/sig/mode.py (renamed from lang/python/pyme/constants/sig/mode.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/sigsum.py (renamed from lang/python/pyme/constants/sigsum.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/status.py (renamed from lang/python/pyme/constants/status.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/constants/validity.py (renamed from lang/python/pyme/constants/validity.py) | 2 | ||||
-rw-r--r-- | lang/python/gpg/core.py (renamed from lang/python/pyme/core.py) | 30 | ||||
-rw-r--r-- | lang/python/gpg/errors.py (renamed from lang/python/pyme/errors.py) | 12 | ||||
-rw-r--r-- | lang/python/gpg/results.py (renamed from lang/python/pyme/results.py) | 0 | ||||
-rw-r--r-- | lang/python/gpg/util.py (renamed from lang/python/pyme/util.py) | 0 | ||||
-rw-r--r-- | lang/python/gpg/version.py.in (renamed from lang/python/pyme/version.py.in) | 4 | ||||
-rw-r--r-- | lang/python/gpgme.i | 32 |
23 files changed, 62 insertions, 66 deletions
diff --git a/lang/python/pyme/__init__.py b/lang/python/gpg/__init__.py index 12c96c28..385b17e3 100644 --- a/lang/python/pyme/__init__.py +++ b/lang/python/gpg/__init__.py @@ -16,17 +16,13 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -"""Pyme: GPGME Interface for Python +"""gpg: GnuPG Interface for Python (GPGME bindings) -Welcome to PyME, the GPGME Interface for Python. "Pyme", when prounced, -rhymes with "Pine". +Welcome to gpg, the GnuPG Interface for Python. The latest release of this package may be obtained from https://www.gnupg.org -Previous releases of this package for Python 2 can be obtained from -http://pyme.sourceforge.net - FEATURES -------- @@ -43,23 +39,23 @@ FEATURES QUICK EXAMPLE ------------- - >>> import pyme - >>> with pyme.Context() as c: - >>> with pyme.Context() as c: + >>> import gpg + >>> with gpg.Context() as c: + >>> with gpg.Context() as c: ... cipher, _, _ = c.encrypt("Hello world :)".encode(), ... passphrase="abc") ... c.decrypt(cipher, passphrase="abc") ... (b'Hello world :)', - <pyme.results.DecryptResult object at 0x7f5ab8121080>, - <pyme.results.VerifyResult object at 0x7f5ab81219b0>) + <gpg.results.DecryptResult object at 0x7f5ab8121080>, + <gpg.results.VerifyResult object at 0x7f5ab81219b0>) GENERAL OVERVIEW ---------------- For those of you familiar with GPGME, you will be right at home here. -Pyme is, for the most part, a direct interface to the C GPGME +The python gpg module is, for the most part, a direct interface to the C GPGME library. However, it is re-packaged in a more Pythonic way -- object-oriented with classes and modules. Take a look at the classes defined here -- they correspond directly to certain object types in GPGME @@ -77,7 +73,7 @@ context = core.Context() context.op_encrypt(recp, 1, plain, cipher) The Python module automatically does error-checking and raises Python -exception pyme.errors.GPGMEError when GPGME signals an error. getcode() +exception gpg.errors.GPGMEError when GPGME signals an error. getcode() and getsource() of this exception return code and source of the error. IMPORTANT NOTE @@ -94,7 +90,7 @@ be found only in GPGME documentation. FOR MORE INFORMATION -------------------- -PYME3 homepage: https://www.gnupg.org/ +GnuPG homepage: https://www.gnupg.org/ GPGME documentation: https://www.gnupg.org/documentation/manuals/gpgme/ """ diff --git a/lang/python/pyme/callbacks.py b/lang/python/gpg/callbacks.py index b25a9a74..b25a9a74 100644 --- a/lang/python/pyme/callbacks.py +++ b/lang/python/gpg/callbacks.py diff --git a/lang/python/pyme/constants/__init__.py b/lang/python/gpg/constants/__init__.py index 96d89e47..c6fa102e 100644 --- a/lang/python/pyme/constants/__init__.py +++ b/lang/python/gpg/constants/__init__.py @@ -2,14 +2,14 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_', globals()) __all__ = ['data', 'event', 'import', 'keylist', 'md', 'pk', 'protocol', 'sig', 'sigsum', 'status', 'validity'] # GPGME 1.7 replaced gpgme_op_edit with gpgme_op_interact. We -# implement pyme.Context.op_edit using gpgme_op_interact, so the +# implement gpg.Context.op_edit using gpgme_op_interact, so the # callbacks will be called with string keywords instead of numeric # status messages. Code that is using these constants will continue # to work. diff --git a/lang/python/pyme/constants/data/__init__.py b/lang/python/gpg/constants/data/__init__.py index 8274ab91..8274ab91 100644 --- a/lang/python/pyme/constants/data/__init__.py +++ b/lang/python/gpg/constants/data/__init__.py diff --git a/lang/python/pyme/constants/data/encoding.py b/lang/python/gpg/constants/data/encoding.py index a05dbb42..fc7c6b22 100644 --- a/lang/python/pyme/constants/data/encoding.py +++ b/lang/python/gpg/constants/data/encoding.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_DATA_ENCODING_', globals()) diff --git a/lang/python/pyme/constants/event.py b/lang/python/gpg/constants/event.py index 2e30c5e1..11e63f09 100644 --- a/lang/python/pyme/constants/event.py +++ b/lang/python/gpg/constants/event.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_EVENT_', globals()) diff --git a/lang/python/pyme/constants/import.py b/lang/python/gpg/constants/import.py index 10e7d3c0..4a65a306 100644 --- a/lang/python/pyme/constants/import.py +++ b/lang/python/gpg/constants/import.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_IMPORT_', globals()) diff --git a/lang/python/pyme/constants/keylist/__init__.py b/lang/python/gpg/constants/keylist/__init__.py index 2ce0edfd..2ce0edfd 100644 --- a/lang/python/pyme/constants/keylist/__init__.py +++ b/lang/python/gpg/constants/keylist/__init__.py diff --git a/lang/python/pyme/constants/keylist/mode.py b/lang/python/gpg/constants/keylist/mode.py index 000dd791..0939c6ca 100644 --- a/lang/python/pyme/constants/keylist/mode.py +++ b/lang/python/gpg/constants/keylist/mode.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_KEYLIST_MODE_', globals()) diff --git a/lang/python/pyme/constants/md.py b/lang/python/gpg/constants/md.py index dbd762ce..7a04849e 100644 --- a/lang/python/pyme/constants/md.py +++ b/lang/python/gpg/constants/md.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_MD_', globals()) diff --git a/lang/python/pyme/constants/pk.py b/lang/python/gpg/constants/pk.py index cfc53095..b2ece88d 100644 --- a/lang/python/pyme/constants/pk.py +++ b/lang/python/gpg/constants/pk.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_PK_', globals()) diff --git a/lang/python/pyme/constants/protocol.py b/lang/python/gpg/constants/protocol.py index a4b6583a..562042e9 100644 --- a/lang/python/pyme/constants/protocol.py +++ b/lang/python/gpg/constants/protocol.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_PROTOCOL_', globals()) diff --git a/lang/python/pyme/constants/sig/__init__.py b/lang/python/gpg/constants/sig/__init__.py index 2ce0edfd..2ce0edfd 100644 --- a/lang/python/pyme/constants/sig/__init__.py +++ b/lang/python/gpg/constants/sig/__init__.py diff --git a/lang/python/pyme/constants/sig/mode.py b/lang/python/gpg/constants/sig/mode.py index fb534bc5..f53d7ed0 100644 --- a/lang/python/pyme/constants/sig/mode.py +++ b/lang/python/gpg/constants/sig/mode.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_SIG_MODE_', globals()) diff --git a/lang/python/pyme/constants/sigsum.py b/lang/python/gpg/constants/sigsum.py index 3d947456..2a7f2c06 100644 --- a/lang/python/pyme/constants/sigsum.py +++ b/lang/python/gpg/constants/sigsum.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_SIGSUM_', globals()) diff --git a/lang/python/pyme/constants/status.py b/lang/python/gpg/constants/status.py index a04d9aae..a0ad073e 100644 --- a/lang/python/pyme/constants/status.py +++ b/lang/python/gpg/constants/status.py @@ -19,7 +19,7 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals # GPGME 1.7 replaced gpgme_op_edit with gpgme_op_interact. We -# implement pyme.Context.op_edit using gpgme_op_interact, so the +# implement gpg.Context.op_edit using gpgme_op_interact, so the # callbacks will be called with string keywords instead of numeric # status messages. Code that is using these constants will continue # to work. diff --git a/lang/python/pyme/constants/validity.py b/lang/python/gpg/constants/validity.py index 4ecd4d3e..da14ca42 100644 --- a/lang/python/pyme/constants/validity.py +++ b/lang/python/gpg/constants/validity.py @@ -18,5 +18,5 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from pyme import util +from gpg import util util.process_constants('GPGME_VALIDITY_', globals()) diff --git a/lang/python/pyme/core.py b/lang/python/gpg/core.py index f0eab436..748bcbb9 100644 --- a/lang/python/pyme/core.py +++ b/lang/python/gpg/core.py @@ -131,13 +131,13 @@ class GpgmeWrapper(object): def _funcwrap(slf, *args): result = func(slf.wrapped, *args) if slf._callback_excinfo: - gpgme.pyme_raise_callback_exception(slf) + gpgme.gpg_raise_callback_exception(slf) return errorcheck(result, "Invocation of " + name) else: def _funcwrap(slf, *args): result = func(slf.wrapped, *args) if slf._callback_excinfo: - gpgme.pyme_raise_callback_exception(slf) + gpgme.gpg_raise_callback_exception(slf) return result doc = self._munge_docstring.sub(r'\2.\1(\3', getattr(func, "__doc__")) @@ -528,7 +528,7 @@ class Context(GpgmeWrapper): errptr) if self._callback_excinfo: - gpgme.pyme_raise_callback_exception(self) + gpgme.gpg_raise_callback_exception(self) errorcheck(err) @@ -567,7 +567,7 @@ class Context(GpgmeWrapper): result = gpgme.gpgme_op_interact(self.wrapped, key, flags, opaquedata, sink) if self._callback_excinfo: - gpgme.pyme_raise_callback_exception(self) + gpgme.gpg_raise_callback_exception(self) errorcheck(result) @property @@ -743,10 +743,10 @@ class Context(GpgmeWrapper): hookdata = (weakref.ref(self), func) else: hookdata = (weakref.ref(self), func, hook) - gpgme.pyme_set_passphrase_cb(self, hookdata) + gpgme.gpg_set_passphrase_cb(self, hookdata) def _free_passcb(self): - if gpgme.pyme_set_passphrase_cb: + if gpgme.gpg_set_passphrase_cb: self.set_passphrase_cb(None) def set_progress_cb(self, func, hook=None): @@ -768,10 +768,10 @@ class Context(GpgmeWrapper): hookdata = (weakref.ref(self), func) else: hookdata = (weakref.ref(self), func, hook) - gpgme.pyme_set_progress_cb(self, hookdata) + gpgme.gpg_set_progress_cb(self, hookdata) def _free_progresscb(self): - if gpgme.pyme_set_progress_cb: + if gpgme.gpg_set_progress_cb: self.set_progress_cb(None) def set_status_cb(self, func, hook=None): @@ -792,10 +792,10 @@ class Context(GpgmeWrapper): hookdata = (weakref.ref(self), func) else: hookdata = (weakref.ref(self), func, hook) - gpgme.pyme_set_status_cb(self, hookdata) + gpgme.gpg_set_status_cb(self, hookdata) def _free_statuscb(self): - if gpgme.pyme_set_status_cb: + if gpgme.gpg_set_status_cb: self.set_status_cb(None) @property @@ -958,7 +958,7 @@ class Data(GpgmeWrapper): if self.wrapped != None and gpgme.gpgme_data_release: gpgme.gpgme_data_release(self.wrapped) if self._callback_excinfo: - gpgme.pyme_raise_callback_exception(self) + gpgme.gpg_raise_callback_exception(self) self.wrapped = None self._free_datacbs() @@ -1003,7 +1003,7 @@ class Data(GpgmeWrapper): else: hookdata = (weakref.ref(self), read_cb, write_cb, seek_cb, release_cb) - gpgme.pyme_data_new_from_cbs(self, hookdata, tmp) + gpgme.gpg_data_new_from_cbs(self, hookdata, tmp) self.wrapped = gpgme.gpgme_data_t_p_value(tmp) gpgme.delete_gpgme_data_t_p(tmp) @@ -1057,7 +1057,7 @@ class Data(GpgmeWrapper): written = gpgme.gpgme_data_write(self.wrapped, buffer) if written < 0: if self._callback_excinfo: - gpgme.pyme_raise_callback_exception(self) + gpgme.gpg_raise_callback_exception(self) else: raise GPGMEError.fromSyserror() return written @@ -1078,7 +1078,7 @@ class Data(GpgmeWrapper): result = gpgme.gpgme_data_read(self.wrapped, size) except: if self._callback_excinfo: - gpgme.pyme_raise_callback_exception(self) + gpgme.gpg_raise_callback_exception(self) else: raise return result @@ -1089,7 +1089,7 @@ class Data(GpgmeWrapper): result = gpgme.gpgme_data_read(self.wrapped, 4096) except: if self._callback_excinfo: - gpgme.pyme_raise_callback_exception(self) + gpgme.gpg_raise_callback_exception(self) else: raise if len(result) == 0: diff --git a/lang/python/pyme/errors.py b/lang/python/gpg/errors.py index 0fd85efa..7f037f0a 100644 --- a/lang/python/pyme/errors.py +++ b/lang/python/gpg/errors.py @@ -28,10 +28,10 @@ EOF = None util.process_constants('GPG_ERR_', globals()) -class PymeError(Exception): +class GpgError(Exception): pass -class GPGMEError(PymeError): +class GPGMEError(GpgError): def __init__(self, error = None, message = None): self.error = error self.message = message @@ -76,7 +76,7 @@ class KeyNotFound(GPGMEError, KeyError): # These errors are raised in the idiomatic interface code. -class EncryptionError(PymeError): +class EncryptionError(GpgError): pass class InvalidRecipients(EncryptionError): @@ -87,7 +87,7 @@ class InvalidRecipients(EncryptionError): gpgme.gpgme_strerror(r.reason)) for r in self.recipients) -class DeryptionError(PymeError): +class DeryptionError(GpgError): pass class UnsupportedAlgorithm(DeryptionError): @@ -96,7 +96,7 @@ class UnsupportedAlgorithm(DeryptionError): def __str__(self): return self.algorithm -class SigningError(PymeError): +class SigningError(GpgError): pass class InvalidSigners(SigningError): @@ -107,7 +107,7 @@ class InvalidSigners(SigningError): gpgme.gpgme_strerror(s.reason)) for s in self.signers) -class VerificationError(PymeError): +class VerificationError(GpgError): pass class BadSignatures(VerificationError): diff --git a/lang/python/pyme/results.py b/lang/python/gpg/results.py index 3383896b..3383896b 100644 --- a/lang/python/pyme/results.py +++ b/lang/python/gpg/results.py diff --git a/lang/python/pyme/util.py b/lang/python/gpg/util.py index e4fca4c1..e4fca4c1 100644 --- a/lang/python/pyme/util.py +++ b/lang/python/gpg/util.py diff --git a/lang/python/pyme/version.py.in b/lang/python/gpg/version.py.in index cfb95100..1a1baf08 100644 --- a/lang/python/pyme/version.py.in +++ b/lang/python/gpg/version.py.in @@ -21,10 +21,10 @@ del absolute_import, print_function from . import gpgme -productname = 'pyme' +productname = 'gpg' versionstr = "@VERSION@" gpgme_versionstr = gpgme.GPGME_VERSION -in_tree_build = bool(gpgme.cvar.pyme_in_tree_build) +in_tree_build = bool(gpgme.cvar.gpg_in_tree_build) versionlist = versionstr.split(".") major = versionlist[0] diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i index 5d074aa9..783531f7 100644 --- a/lang/python/gpgme.i +++ b/lang/python/gpgme.i @@ -159,7 +159,7 @@ $1 = NULL; else { PyObject *pypointer; - pypointer = _pyme_obj2gpgme_data_t($input, $argnum, &wrapper, + pypointer = _gpg_obj2gpgme_data_t($input, $argnum, &wrapper, &bytesio, &view); if (pypointer == NULL) return NULL; @@ -428,7 +428,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "EncryptResult"); + $result = _gpg_wrap_result(fragile, "EncryptResult"); Py_DECREF(fragile); } @@ -436,7 +436,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "DecryptResult"); + $result = _gpg_wrap_result(fragile, "DecryptResult"); Py_DECREF(fragile); } @@ -444,7 +444,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "SignResult"); + $result = _gpg_wrap_result(fragile, "SignResult"); Py_DECREF(fragile); } @@ -452,7 +452,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "VerifyResult"); + $result = _gpg_wrap_result(fragile, "VerifyResult"); Py_DECREF(fragile); } @@ -460,7 +460,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "ImportResult"); + $result = _gpg_wrap_result(fragile, "ImportResult"); Py_DECREF(fragile); } @@ -468,7 +468,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "GenkeyResult"); + $result = _gpg_wrap_result(fragile, "GenkeyResult"); Py_DECREF(fragile); } @@ -476,7 +476,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "KeylistResult"); + $result = _gpg_wrap_result(fragile, "KeylistResult"); Py_DECREF(fragile); } @@ -484,7 +484,7 @@ PyObject *fragile; fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, %newpointer_flags); - $result = _pyme_wrap_result(fragile, "VFSMountResult"); + $result = _gpg_wrap_result(fragile, "VFSMountResult"); Py_DECREF(fragile); } @@ -507,7 +507,7 @@ Py_DECREF($result); return NULL; /* raise */ } - o = _pyme_wrap_result(fragile, "EngineInfo"); + o = _gpg_wrap_result(fragile, "EngineInfo"); Py_DECREF(fragile); if (o == NULL) { @@ -528,7 +528,7 @@ return PyErr_Format(PyExc_TypeError, "interact callback must be a tuple of size 2 or 3"); - $1 = (gpgme_interact_cb_t) _pyme_interact_cb; + $1 = (gpgme_interact_cb_t) _gpg_interact_cb; $2 = $input; } @@ -547,7 +547,7 @@ "callback must be a tuple of size 2"); if (! PyCallable_Check(PyTuple_GetItem($input, 1))) return PyErr_Format(PyExc_TypeError, "second item must be callable"); - $1 = _pyme_assuan_data_cb; + $1 = _gpg_assuan_data_cb; $2 = $input; } } @@ -564,7 +564,7 @@ "callback must be a tuple of size 2"); if (! PyCallable_Check(PyTuple_GetItem($input, 1))) return PyErr_Format(PyExc_TypeError, "second item must be callable"); - $1 = _pyme_assuan_inquire_cb; + $1 = _gpg_assuan_inquire_cb; $2 = $input; } } @@ -581,7 +581,7 @@ "callback must be a tuple of size 2"); if (! PyCallable_Check(PyTuple_GetItem($input, 1))) return PyErr_Format(PyExc_TypeError, "second item must be callable"); - $1 = _pyme_assuan_status_cb; + $1 = _gpg_assuan_status_cb; $2 = $input; } } @@ -654,13 +654,13 @@ FILE *fdopen(int fildes, const char *mode); /* SWIG runtime support for helpers.c */ PyObject * -_pyme_wrap_gpgme_data_t(gpgme_data_t data) +_gpg_wrap_gpgme_data_t(gpgme_data_t data) { return SWIG_Python_NewPointerObj(NULL, data, SWIGTYPE_p_gpgme_data, 0); } gpgme_ctx_t -_pyme_unwrap_gpgme_ctx_t(PyObject *wrapped) +_gpg_unwrap_gpgme_ctx_t(PyObject *wrapped) { gpgme_ctx_t result; if (SWIG_ConvertPtr(wrapped, |