From a92490af2e797446766b5030459e78896342d433 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@leap.se>
Date: Mon, 15 Apr 2013 00:28:22 +0000
Subject: [PATCH] Remove checks from gnupg.py and add utility functions to
 util.py.

 * Remove _has_readwrite()
 * Remove _is_file()
 * Remove _is_stream()
 * Remove _is_sequence()
 * Add _create_gpghome()
 * Add _find_gpgbinary()
---
 gnupg/gnupg.py | 39 -------------------------------
 gnupg/util.py  | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/gnupg/gnupg.py b/gnupg/gnupg.py
index 3376ad6..79e5cf5 100644
--- a/gnupg/gnupg.py
+++ b/gnupg/gnupg.py
@@ -157,45 +157,6 @@ def _copy_data(instream, outstream):
     else:
         logger.debug("closed output, %d bytes sent", sent)
 
-def _has_readwrite(path):
-    """
-    Determine if the real uid/gid of the executing user has read and write
-    permissions for a directory or a file.
-
-    :type path: C{str}
-    :param path: The path to the directory or file to check permissions for.
-
-    :rtype: C{bool}
-    :param: True if real uid/gid has read+write permissions, False otherwise.
-    """
-    return os.access(path, os.R_OK and os.W_OK)
-
-def _is_file(input):
-    """
-    Check that the size of the thing which is supposed to be a filename has
-    size greater than zero, without following symbolic links or using
-    :func:`os.path.isfile`.
-    """
-    try:
-        assert os.lstat(input).st_size > 0, "not a file: %s" % input
-    except (AssertionError, TypeError) as error:
-        logger.debug(error.message)
-        return False
-    else:
-        return True
-
-def _is_stream(input):
-    """Check that the input is a byte stream.
-
-    :param input: An object provided for reading from or writing to
-    :rtype: C{bool}
-    :returns: True if :param:`input` is a stream, False if otherwise.
-    """
-    return isinstance(input, BytesIO)
-
-def _is_sequence(instance):
-    return isinstance(instance,list) or isinstance(instance,tuple)
-
 def _make_binary_stream(s, encoding):
     try:
         if _py3k:
diff --git a/gnupg/util.py b/gnupg/util.py
index de6156c..3b6cd17 100644
--- a/gnupg/util.py
+++ b/gnupg/util.py
@@ -31,6 +31,68 @@ from datetime   import datetime
 import logging
 import os
 
+try:
+    from io import StringIO
+    from io import BytesIO
+except ImportError:
+    from cStringIO import StringIO
+
+try:
+    from logging import NullHandler
+except:
+    class NullHandler(logging.Handler):
+        def handle(self, record):
+            pass
+logger = logging.getLogger('gnupg')
+if not logger.handlers:
+    logger.addHandler(NullHandler())
+
+try:
+    unicode
+    _py3k = False
+except NameError:
+    _py3k = True
+
+## Directory shortcuts:
+_here = os.getcwd()                           ## .../python-gnupg/gnupg
+_repo = _here.rsplit(__module__, 1)[0]        ## .../python-gnupg
+_test = os.path.join(_repo, 'tmp_test')       ## .../python-gnupg/tmp_test
+_user = os.environ.get('HOME')                ## $HOME
+_ugpg = os.path.join(_user, '.gnupg')         ## $HOME/.gnupg
+_conf = os.path.join(os.path.join(_user, '.config'),
+                     'python-gnupg')          ## $HOME/.config/python-gnupg
+
+def _create_gpghome(gpghome):
+    """Create the specified GnuPG home directory, if necessary.
+
+    :param str gpghome: The directory to use.
+    :rtype: bool
+    :returns: True if no errors occurred and the directory was created or
+              existed beforehand, False otherwise.
+    """
+    ## xxx how will this work in a virtualenv?
+    if not os.path.isabs(gpghome):
+        message = ("Got non-abs gpg home dir path: %s" % gpghome)
+        logger.warn("util._create_gpghome(): %s" % message)
+        gpghome = os.path.abspath(gpghome)
+    if not os.path.isdir(gpghome):
+        message = ("Creating gpg home dir: %s" % gpghome)
+        logger.warn("util._create_gpghome(): %s" % message)
+        try:
+            os.makedirs(gpghome, 0x1C0)
+        except OSError as ose:
+            logger.error(ose, exc_info=1)
+            return False
+        else:
+            return True
+    else:
+        return True
+
+def _find_gpgbinary(gpgbinary=None):
+    """Find the absolute path to the GnuPG binary.
+
+    Also run checks that the binary is not a symlink, and check that
+    our process real uid has exec permissions.
 
 class ListPackets():
     """