remove all kinds of mangling

Author: funbringer

testgres/backup.py

@@ -7,17 +7,17 @@
 from six import raise_from
 
 from .consts import \
-    DATA_DIR as _DATA_DIR, \
-    PG_CONF_FILE as _PG_CONF_FILE, \
-    BACKUP_LOG_FILE as _BACKUP_LOG_FILE, \
-    DEFAULT_XLOG_METHOD as _DEFAULT_XLOG_METHOD
+    DATA_DIR, \
+    PG_CONF_FILE, \
+    BACKUP_LOG_FILE, \
+    DEFAULT_XLOG_METHOD
 
 from .exceptions import BackupException
 
 from .utils import \
     get_bin_path, \
-    default_username as _default_username, \
-    execute_utility as _execute_utility
+    default_username, \
+    execute_utility
 
 
 class NodeBackup(object):
@@ -27,13 +27,13 @@ class NodeBackup(object):
 
     @property
     def log_file(self):
-        return os.path.join(self.base_dir, _BACKUP_LOG_FILE)
+        return os.path.join(self.base_dir, BACKUP_LOG_FILE)
 
     def __init__(self,
                  node,
                  base_dir=None,
                  username=None,
-                 xlog_method=_DEFAULT_XLOG_METHOD):
+                 xlog_method=DEFAULT_XLOG_METHOD):
         """
         Create a new backup.
 
@@ -48,7 +48,7 @@ def __init__(self,
             raise BackupException('Node must be running')
 
         # Set default arguments
-        username = username or _default_username()
+        username = username or default_username()
         base_dir = base_dir or tempfile.mkdtemp()
 
         # public
@@ -59,7 +59,7 @@ def __init__(self,
         # private
         self._available = True
 
-        data_dir = os.path.join(self.base_dir, _DATA_DIR)
+        data_dir = os.path.join(self.base_dir, DATA_DIR)
 
         # yapf: disable
         _params = [
@@ -70,7 +70,7 @@ def __init__(self,
             "-D", data_dir,
             "-X", xlog_method
         ]
-        _execute_utility(_params, self.log_file)
+        execute_utility(_params, self.log_file)
 
     def __enter__(self):
         return self
@@ -98,8 +98,8 @@ def _prepare_dir(self, destroy):
         if available:
             dest_base_dir = tempfile.mkdtemp()
 
-            data1 = os.path.join(self.base_dir, _DATA_DIR)
-            data2 = os.path.join(dest_base_dir, _DATA_DIR)
+            data1 = os.path.join(self.base_dir, DATA_DIR)
+            data2 = os.path.join(dest_base_dir, DATA_DIR)
 
             try:
                 # Copy backup to new data dir
@@ -140,8 +140,8 @@ def spawn_primary(self, name=None, destroy=True, use_logging=False):
         # New nodes should always remove dir tree
         node._should_rm_dirs = True
 
-        node.append_conf(_PG_CONF_FILE, "\n")
-        node.append_conf(_PG_CONF_FILE, "port = {}".format(node.port))
+        node.append_conf(PG_CONF_FILE, "\n")
+        node.append_conf(PG_CONF_FILE, "port = {}".format(node.port))
 
         return node
 

testgres/cache.py

@@ -15,7 +15,7 @@
 
 from .utils import \
     get_bin_path, \
-    execute_utility as _execute_utility
+    execute_utility
 
 
 def cached_initdb(data_dir, initdb_logfile, initdb_params=[]):
@@ -26,7 +26,7 @@ def cached_initdb(data_dir, initdb_logfile, initdb_params=[]):
     def call_initdb(initdb_dir):
         try:
             _params = [get_bin_path("initdb"), "-D", initdb_dir, "-N"]
-            _execute_utility(_params + initdb_params, initdb_logfile)
+            execute_utility(_params + initdb_params, initdb_logfile)
         except ExecUtilException as e:
             raise_from(InitNodeException("Failed to run initdb"), e)
 

testgres/connection.py

@@ -14,8 +14,9 @@
 from .exceptions import QueryException
 
 from .utils import \
-    default_dbname as _default_dbname, \
-    default_username as _default_username
+    default_dbname, \
+    default_username
+
 
 # export these exceptions
 InternalError = pglib.InternalError
@@ -37,9 +38,9 @@ class NodeConnection(object):
 
     def __init__(self, node, dbname=None, username=None, password=None):
 
-        # Use default user if not specified
-        dbname = dbname or _default_dbname()
-        username = username or _default_username()
+        # Set default arguments
+        dbname = dbname or default_dbname()
+        username = username or default_username()
 
         self._node = node