Merge branch 'release/2.2.0' of myrepo.no.oracle.com:connector-python into release/2.2.0

Author: Reggie Burnett

cpyint

@@ -25,10 +25,11 @@
 
 import socket
 
-from .protocol import Protocol, MessageReaderWriter
 from .authentication import MySQL41AuthPlugin
-from .result import Result, RowResult, DocResult
+from .errors import InterfaceError
 from .crud import Schema
+from .protocol import Protocol, MessageReaderWriter
+from .result import Result, RowResult, DocResult
 from .statement import SqlStatement
 
 _DROP_DATABASE_QUERY = "DROP DATABASE IF EXISTS `{0}`"
@@ -117,7 +118,7 @@ def execute_sql_scalar(self, sql, *args):
         result = RowResult(self)
         result.fetch_all()
         if result.count == 0:
-            raise Exception("No data found")
+            raise InterfaceError("No data found")
         return result[0][0]
 
     def get_row_result(self, cmd, *args):

lib/mysqlx/connection.py

@@ -23,6 +23,7 @@
 
 """Implementation of the CRUD database objects."""
 
+from .errors import ProgrammingError
 from .statement import (FindStatement, AddStatement, RemoveStatement,
                         ModifyStatement, SelectStatement, InsertStatement,
                         DeleteStatement, UpdateStatement,
@@ -158,7 +159,7 @@ def get_table(self, name, check_existence=False):
         table = Table(self, name)
         if check_existence:
             if not table.exists_in_database():
-                raise Exception("table does not exist")
+                raise ProgrammingError("Table does not exist")
         return table
 
     def get_collection(self, name, check_existence=False):
@@ -170,7 +171,7 @@ def get_collection(self, name, check_existence=False):
         collection = Collection(self, name)
         if check_existence:
             if not collection.exists_in_database():
-                raise Exception("collection does not exist")
+                raise ProgrammingError("Collection does not exist")
         return collection
 
     def drop_collection(self, name):
@@ -207,7 +208,7 @@ def create_collection(self, name, reuse=False):
             self._connection.execute_nonquery("xplugin", "create_collection",
                                               True, self._name, name)
         elif not reuse:
-            raise Exception("Collection already exists")
+            raise ProgrammingError("Collection already exists")
         return collection
 
 

lib/mysqlx/crud.py

@@ -43,7 +43,7 @@ def __init__(self, value):
         elif isinstance(value, basestring):
             self.__dict__ = json.loads(value)
         else:
-            raise Exception("Unable to handle type: ".format(type(value)))
+            raise ValueError("Unable to handle type: ".format(type(value)))
 
     def __getitem__(self, index):
         return self.__dict__[index]