fix CI error

aliyun/log/etl_core/transform/condition_list.py

@@ -17,8 +17,7 @@
 import logging
 import re
 import six
-from collections import OrderedDict
-import typing
+from collections import OrderedDict, Callable
 from ..exceptions import SettingError
 
 logger = logging.getLogger(__name__)
@@ -29,14 +28,14 @@
 def get_check(c):
     if isinstance(c, bool):
         return lambda e: c
-    elif isinstance(c, typing.Callable):
+    elif isinstance(c, Callable):
         return c
     elif isinstance(c, (dict, OrderedDict)):
         def check(event):
             for k, v in six.iteritems(c):
                 if k in event:
                     if (isinstance(v, bool) and v) \
-                            or (isinstance(v, typing.Callable) and v(event[k])) \
+                            or (isinstance(v, Callable) and v(event[k])) \
                             or (isinstance(v, (six.text_type, six.binary_type))
                                 and re.match(v, event[k])):
                         continue
@@ -106,7 +105,7 @@ def call_processor(self, fn, evt, *args, **kwargs):
     def __call__(self, entity):
         if isinstance(entity, (dict, OrderedDict)):
             return any(c(entity) for c in self.check_list)
-        elif isinstance(entity, typing.Callable):
+        elif isinstance(entity, Callable):
             fn = entity
 
             @functools.wraps(fn)

aliyun/log/etl_core/transform/transform_list.py

@@ -84,8 +84,7 @@
 """
 
 import logging
-import typing
-from collections import OrderedDict
+from collections import OrderedDict, Callable
 
 import six
 from ..trans_comp import REGEX
@@ -105,13 +104,13 @@ def __init__(self, trans):
 
         self.transform_list = []
         for tr in self.trans:
-            if isinstance(tr, typing.Callable):
+            if isinstance(tr, Callable):
                 self.transform_list.append(tr)
             elif isinstance(tr, (dict, OrderedDict)):
                 def real_transform(event):
                     result = {}
                     for k, v in six.iteritems(tr):
-                        if isinstance(v, typing.Callable):
+                        if isinstance(v, Callable):
                             v = v(event)
 
                         if isinstance(v, (six.text_type, six.binary_type)):
@@ -133,7 +132,7 @@ def real_transform(event):
                 inpt, config = tr[0], tr[1]
                 if isinstance(config, (six.text_type, six.binary_type)):
                     self.transform_list.append(lambda e: REGEX(*tr[1:])(e, inpt))
-                elif isinstance(config, typing.Callable):
+                elif isinstance(config, Callable):
                     self.transform_list.append(lambda e: config(e, inpt))
                 else:
                     logger.warning("unknown transform config setting: {0}".format(config))

tests/sample.py

@@ -240,8 +240,11 @@ def sample_cleanup(client, project, logstore, delete_project=False):
         print("ignore error when cleaning up: ", ex)
 
     if delete_project:
-        time.sleep(30)
-        client.delete_project(project)
+        time.sleep(60)
+        try:
+            client.delete_project(project)
+        except Exception as ex:
+            print("fail to delete project, error: {0}".format(ex))
 
 
 def sample_crud_consumer_group(client, project, logstore, consumer_group):