Merge branch 'release/1.5.18'

box · Jun 26, 2018 · d886678 · d886678
2 parents 309fa29 + 2d67cf3
commit d886678
Show file tree

Hide file tree

Showing 27 changed files with 352 additions and 109 deletions.
diff --git a/docs/etcdb.constants.rst b/docs/etcdb.constants.rst
diff --git a/docs/etcdb.execute.ddl.rst b/docs/etcdb.execute.ddl.rst
@@ -0,0 +1,30 @@
+etcdb.execute.ddl package
+=========================
+
+Submodules
+----------
+
+etcdb.execute.ddl.create module
+-------------------------------
+
+.. automodule:: etcdb.execute.ddl.create
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.ddl.drop module
+-----------------------------
+
+.. automodule:: etcdb.execute.ddl.drop
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: etcdb.execute.ddl
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/etcdb.execute.dml.rst b/docs/etcdb.execute.dml.rst
@@ -0,0 +1,70 @@
+etcdb.execute.dml package
+=========================
+
+Submodules
+----------
+
+etcdb.execute.dml.delete module
+-------------------------------
+
+.. automodule:: etcdb.execute.dml.delete
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.dml.insert module
+-------------------------------
+
+.. automodule:: etcdb.execute.dml.insert
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.dml.select module
+-------------------------------
+
+.. automodule:: etcdb.execute.dml.select
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.dml.show module
+-----------------------------
+
+.. automodule:: etcdb.execute.dml.show
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.dml.update module
+-------------------------------
+
+.. automodule:: etcdb.execute.dml.update
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.dml.use module
+----------------------------
+
+.. automodule:: etcdb.execute.dml.use
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.execute.dml.wait module
+-----------------------------
+
+.. automodule:: etcdb.execute.dml.wait
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: etcdb.execute.dml
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/etcdb.execute.rst b/docs/etcdb.execute.rst
@@ -0,0 +1,18 @@
+etcdb.execute package
+=====================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    etcdb.execute.ddl
+    etcdb.execute.dml
+
+Module contents
+---------------
+
+.. automodule:: etcdb.execute
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/etcdb.log.rst b/docs/etcdb.log.rst
@@ -0,0 +1,10 @@
+etcdb.log package
+=================
+
+Module contents
+---------------
+
+.. automodule:: etcdb.log
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/etcdb.rst b/docs/etcdb.rst
@@ -6,7 +6,8 @@ Subpackages
 
 .. toctree::
 
-    etcdb.constants
+    etcdb.execute
+    etcdb.log
     etcdb.sqlparser
 
 Submodules
@@ -28,14 +29,6 @@ etcdb.connection module
     :undoc-members:
     :show-inheritance:
 
-etcdb.converters module
------------------------
-
-.. automodule:: etcdb.converters
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 etcdb.cursor module
 -------------------
 
@@ -76,10 +69,34 @@ etcdb.etcdtimestamp module
     :undoc-members:
     :show-inheritance:
 
-etcdb.times module
-------------------
+etcdb.eval\_expr module
+-----------------------
+
+.. automodule:: etcdb.eval_expr
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.exception module
+----------------------
+
+.. automodule:: etcdb.exception
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.lock module
+-----------------
+
+.. automodule:: etcdb.lock
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+etcdb.resultset module
+----------------------
 
-.. automodule:: etcdb.times
+.. automodule:: etcdb.resultset
     :members:
     :undoc-members:
     :show-inheritance:

diff --git a/docs/etcdb.sqlparser.rst b/docs/etcdb.sqlparser.rst
@@ -4,10 +4,10 @@ etcdb.sqlparser package
 Submodules
 ----------
 
-etcdb.sqlparser.lexer module
-----------------------------
+etcdb.sqlparser.etcdb\_lexer module
+-----------------------------------
 
-.. automodule:: etcdb.sqlparser.lexer
+.. automodule:: etcdb.sqlparser.etcdb_lexer
     :members:
     :undoc-members:
     :show-inheritance:
@@ -28,8 +28,8 @@ etcdb.sqlparser.parsetab module
     :undoc-members:
     :show-inheritance:
 
-etcdb.sqlparser.sql_tree module
--------------------------------
+etcdb.sqlparser.sql\_tree module
+--------------------------------
 
 .. automodule:: etcdb.sqlparser.sql_tree
     :members:

diff --git a/docs/index.rst b/docs/index.rst
@@ -16,7 +16,8 @@ Contents:
    usage
    modules
    contributing
-   authorshistory
+   authors
+   history
 
 Indices and tables
 ==================

diff --git a/etcdb/__init__.py b/etcdb/__init__.py
@@ -22,7 +22,7 @@
 
 __author__ = 'Box TechOps Database Team'
 __email__ = '[email protected]'
-__version__ = '1.5.16'
+__version__ = '1.5.18'
 
 
 def _split_version(version):

diff --git a/etcdb/connection.py b/etcdb/connection.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 """Connection class definition"""
-import inspect
 
 from pyetcd.client import Client
 
@@ -60,7 +59,9 @@ def _santize_pyetcd_kwargs(kwargs):
         :param kwargs: input dictionary with keyword arguments.
         :return: dictionary without non-allowed keys.
         """
-        allowed_kwargs = inspect.getargspec(Client.__init__).args
+        allowed_kwargs = [
+            'host', 'port', 'srv_domain', 'version_prefix', 'protocol', 'allow_reconnect'
+        ]
         args = {}
         for arg in kwargs:
             if arg in allowed_kwargs:

diff --git a/etcdb/eval_expr.py b/etcdb/eval_expr.py
@@ -16,7 +16,8 @@ class EtcdbFunction(object):
     :type function_name: callable
     :param group: True if the functions is aggregate function
     :type group: bool
-    :param *args: Arguments to pass to function_name"""
+    :param args: Arguments to pass to function_name
+    :param kwargs: Keyword arguments"""
     def __init__(self, *args, **kwargs):
 
         self._function = args[0]

diff --git a/etcdb/execute/dml/select.py b/etcdb/execute/dml/select.py
@@ -3,7 +3,7 @@
 
 import time
 
-from pyetcd import EtcdException
+from pyetcd import EtcdEmptyResponse
 
 from etcdb import OperationalError, InternalError
 from etcdb.eval_expr import eval_expr, EtcdbFunction
@@ -95,7 +95,7 @@ def get_row_by_primary_key(etcd_client, db, table, primary_key, **kwargs):
         try:
             etcd_response = etcd_client.read(key, **client_kwargs)
             break
-        except EtcdException as err:
+        except EtcdEmptyResponse as err:
             LOG.warning("Retry #%d after error: %s", i, err)
             time.sleep(1)
     if not etcd_response: