fix some bugs (aliyun#200)

* 1.fix ListResource bug
2.remove schema ext_info check

* 1.modify param desc

aliyun/log/logclient.py

@@ -3523,8 +3523,8 @@ def create_resource(self, resource):
         Unsuccessful operation will cause an LogException.
         resource options: resource_name resource_type  [schema:List[ResourceSchemaItem],description,ext_info]
 
-        :type resource: instance:Resource
-        :param resource: resource obj
+        :type resource: Resource
+        :param resource: instance of Resource
         """
         if not isinstance(resource, Resource):
             raise TypeError("record must be instance of Resource ")
@@ -3560,7 +3560,7 @@ def delete_resource(self, resource_name):
         :param resource_name: resource name
         """
         if not isinstance(resource_name, str):
-            raise TypeError("resource_name type must be %s" % str)
+            raise TypeError("resource_name type must be str")
         headers = {}
         params = {}
         resource = "/resources/" + resource_name
@@ -3573,7 +3573,7 @@ def update_resource(self, resource):
         resource options: resource_name [schema,description,ext_info]
 
         :type resource: Resource
-        :param resource: resource
+        :param resource: instance of Resource
         """
         if not isinstance(resource, Resource):
             raise TypeError("resource type must be Resource instance")
@@ -3603,7 +3603,7 @@ def get_resource(self, resource_name):
         :param resource_name: resource name
         """
         if not isinstance(resource_name, str):
-            raise TypeError("resource_name type must be %s" % str)
+            raise TypeError("resource_name type must be str")
         headers = {}
         params = {}
         resource = "/resources/" + resource_name

aliyun/log/resource_params.py

@@ -139,7 +139,7 @@ class ResourceSchemaItem:
     }
 
     def __init__(self, column=None, ext_info=None, schema_type=None):
-        check_type_for_init(column=column, ext_info=ext_info, schema_type=schema_type, instance=self)
+        check_type_for_init(column=column, schema_type=schema_type, instance=self)
         self.column = column
         self.ext_info = ext_info
         self.type = schema_type
@@ -154,7 +154,6 @@ def set_column(self, column):
     def get_ext_info(self):
         return self.ext_info
 
-    @check_params("ext_info", str)
     def set_ext_info(self, ext_info):
         self.ext_info = ext_info
 
@@ -170,7 +169,7 @@ def to_dict(self):
         if self.get_column():
             schema_dict["column"] = self.get_column()
         if self.get_ext_info():
-            schema_dict["ext_info"] = self.get_column()
+            schema_dict["ext_info"] = self.get_ext_info()
         if self.get_schema_type():
             schema_dict["type"] = self.get_schema_type()
         return schema_dict
@@ -297,8 +296,6 @@ def to_dict(self):
             result["create_time"] = self.create_time
         if self.last_modify_time:
             result["last_modify_time"] = self.last_modify_time
-        if self.last_modify_time:
-            result["last_modify_time"] = self.last_modify_time
         if self.resource_name:
             result["resource_name"] = self.resource_name
         if self.resource_type:
@@ -315,9 +312,10 @@ def to_dict(self):
     def from_dict(cls, dict_data):
         schema_list = Util.convert_unicode_to_str(json.loads(dict_data.get("schema"))).get("schema")
         schema_instance_list = []
-        for schema in schema_list:
-            schema_instance_list.append(ResourceSchemaItem(column=schema.get("column"), schema_type=schema.get("type"),
-                                                           ext_info=schema.get("ext_info")))
+        if schema_list:
+            for schema in schema_list:
+                schema_instance_list.append(ResourceSchemaItem(column=schema.get("column"), schema_type=schema.get("type"),
+                                                               ext_info=schema.get("ext_info")))
         resource = Resource()
         resource.set_resource_name(dict_data.get("name"))
         resource.set_description(dict_data.get('description'))