python bindings: estreams fixben/estreams-fix

* lang/python/src/core.py: Adjusted new_from_estream function to alias
  new_from_stream instead of fd.
* fixed the _gpgme import errors introduced in commit
  08cd34afb762975b0273575035dacf69449ef241 by changing the exported
  functions/types to match the inner module where all the work is
  done, rather than the outer one(s).

Tested-by: Ben McGinnes <[email protected]>
Signed-off-by: Ben McGinnes <[email protected]>

1 files changed, 7 insertions, 7 deletions

diff --git a/lang/python/src/core.py b/lang/python/src/core.py
index 1a0ec98e..f440d92d 100644
--- a/lang/python/src/core.py
+++ b/lang/python/src/core.py
@@ -1562,18 +1562,18 @@ class Data(GpgmeWrapper):
         self.wrapped = gpgme.gpgme_data_t_p_value(tmp)
         gpgme.delete_gpgme_data_t_p(tmp)
 
-    def new_from_estream(self, file):
-        """This wrap around gpgme_data_new_from_estream is an alias for
-        new_from_fd() method since in python there's no difference
-        between file stream and file descriptor"""
-        self.new_from_fd(file)
-
     def new_from_stream(self, file):
         """This wrap around gpgme_data_new_from_stream is an alias for
         new_from_fd() method since in python there's no difference
-        between file stream and file descriptor"""
+        between file stream and file descriptor."""
         self.new_from_fd(file)
 
+    def new_from_estream(self, file):
+        """This wrap around gpgme_data_new_from_estream is an alias for
+        new_from_fd() method since in python there's no difference
+        between file stream and file descriptor, but using fd broke."""
+        self.new_from_stream(file)
+
     def write(self, buffer):
         """Write buffer given as string or bytes.