Merge branch 'dev' into wangbill/fstring

Author: YunchuWang

azure/functions/_abc.py

@@ -422,32 +422,3 @@ class OrchestrationContext(abc.ABC):
     @abc.abstractmethod
     def body(self) -> str:
         pass
-
-
-class SqlRow(abc.ABC):
-
-    @classmethod
-    @abc.abstractmethod
-    def from_json(cls, json_data: str) -> 'SqlRow':
-        pass
-
-    @classmethod
-    @abc.abstractmethod
-    def from_dict(cls, dct: dict) -> 'SqlRow':
-        pass
-
-    @abc.abstractmethod
-    def __getitem__(self, key):
-        pass
-
-    @abc.abstractmethod
-    def __setitem__(self, key, value):
-        pass
-
-    @abc.abstractmethod
-    def to_json(self) -> str:
-        pass
-
-
-class SqlRowList(abc.ABC):
-    pass

azure/functions/_sql.py

@@ -1,25 +1,52 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-
+import abc
 import collections
 import json
 
-from . import _abc
+
+class BaseSqlRow(abc.ABC):
+
+    @classmethod
+    @abc.abstractmethod
+    def from_json(cls, json_data: str) -> 'BaseSqlRow':
+        raise NotImplementedError
+
+    @classmethod
+    @abc.abstractmethod
+    def from_dict(cls, dct: dict) -> 'BaseSqlRow':
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __getitem__(self, key):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __setitem__(self, key, value):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def to_json(self) -> str:
+        raise NotImplementedError
+
+
+class BaseSqlRowList(abc.ABC):
+    pass
 
 
-class SqlRow(_abc.SqlRow, collections.UserDict):
+class SqlRow(BaseSqlRow, collections.UserDict):
     """A SQL Row.
 
     SqlRow objects are ''UserDict'' subclasses and behave like dicts.
     """
 
     @classmethod
-    def from_json(cls, json_data: str) -> 'SqlRow':
+    def from_json(cls, json_data: str) -> 'BaseSqlRow':
         """Create a SqlRow from a JSON string."""
         return cls.from_dict(json.loads(json_data))
 
     @classmethod
-    def from_dict(cls, dct: dict) -> 'SqlRow':
+    def from_dict(cls, dct: dict) -> 'BaseSqlRow':
         """Create a SqlRow from a dict object"""
         return cls({k: v for k, v in dct.items()})
 
@@ -39,6 +66,6 @@ def __repr__(self) -> str:
         )
 
 
-class SqlRowList(_abc.SqlRowList, collections.UserList):
+class SqlRowList(BaseSqlRowList, collections.UserList):
     "A ''UserList'' subclass containing a list of :class:'~SqlRow' objects"
     pass

azure/functions/decorators/function_app.py

@@ -349,8 +349,8 @@ def route(self,
               methods: Optional[
                   Union[Iterable[str], Iterable[HttpMethod]]] = None,
               auth_level: Optional[Union[AuthLevel, str]] = None,
-              trigger_extra_fields: Dict = {},
-              binding_extra_fields: Dict = {}
+              trigger_extra_fields: Dict[str, Any] = {},
+              binding_extra_fields: Dict[str, Any] = {}
               ) -> Callable[..., Any]:
         """The route decorator adds :class:`HttpTrigger` and
         :class:`HttpOutput` binding to the :class:`FunctionBuilder` object
@@ -405,7 +405,7 @@ def schedule(self,
                  run_on_startup: Optional[bool] = None,
                  use_monitor: Optional[bool] = None,
                  data_type: Optional[Union[DataType, str]] = None,
-                 **kwargs) -> Callable[..., Any]:
+                 **kwargs: Any) -> Callable[..., Any]:
         """The schedule decorator adds :class:`TimerTrigger` to the
         :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -457,7 +457,7 @@ def service_bus_queue_trigger(
             access_rights: Optional[Union[AccessRights, str]] = None,
             is_sessions_enabled: Optional[bool] = None,
             cardinality: Optional[Union[Cardinality, str]] = None,
-            **kwargs) -> Callable[..., Any]:
+            **kwargs: Any) -> Callable[..., Any]:
         """The on_service_bus_queue_change decorator adds
         :class:`ServiceBusQueueTrigger` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -516,7 +516,7 @@ def service_bus_topic_trigger(
             access_rights: Optional[Union[AccessRights, str]] = None,
             is_sessions_enabled: Optional[bool] = None,
             cardinality: Optional[Union[Cardinality, str]] = None,
-            **kwargs) -> Callable[..., Any]:
+            **kwargs: Any) -> Callable[..., Any]:
         """The on_service_bus_topic_change decorator adds
         :class:`ServiceBusTopicTrigger` to the :class:`FunctionBuilder` object
         for building :class:`Function` object used in worker function
@@ -624,7 +624,7 @@ def event_hub_message_trigger(self,
                                       Union[Cardinality, str]] = None,
                                   consumer_group: Optional[
                                       str] = None,
-                                  **kwargs) -> Callable[..., Any]:
+                                  **kwargs: Any) -> Callable[..., Any]:
         """The event_hub_message_trigger decorator adds
         :class:`EventHubTrigger`
         to the :class:`FunctionBuilder` object
@@ -697,7 +697,7 @@ def cosmos_db_trigger(self,
                           preferred_locations: Optional[str] = None,
                           data_type: Optional[
                               Union[DataType, str]] = None,
-                          **kwargs) -> \
+                          **kwargs: Any) -> \
             Callable[..., Any]:
         """The cosmos_db_trigger decorator adds :class:`CosmosDBTrigger`
         to the :class:`FunctionBuilder` object

azure/functions/sql.py

@@ -15,11 +15,11 @@ class SqlConverter(meta.InConverter, meta.OutConverter,
 
     @classmethod
     def check_input_type_annotation(cls, pytype: type) -> bool:
-        return issubclass(pytype, sql.SqlRowList)
+        return issubclass(pytype, sql.BaseSqlRowList)
 
     @classmethod
     def check_output_type_annotation(cls, pytype: type) -> bool:
-        return issubclass(pytype, (sql.SqlRowList, sql.SqlRow))
+        return issubclass(pytype, (sql.BaseSqlRowList, sql.BaseSqlRow))
 
     @classmethod
     def decode(cls,

tests/test_sql.py

@@ -1,12 +1,12 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import json
 import unittest
 
 import azure.functions as func
 import azure.functions.sql as sql
 from azure.functions.meta import Datum
-import json
 
 
 class TestSql(unittest.TestCase):