test: fix compatibility of test cases on python 2.7

Author: lihsai0

qiniu/region.py

@@ -27,7 +27,7 @@ def wrapper(self, *args, **kwargs):
     return decorator
 
 
-class LegacyRegion(_HTTPRegion):
+class LegacyRegion(_HTTPRegion, object):
     """七牛上传区域类
     该类主要内容上传区域地址。
     """

qiniu/retry/retrier.py

@@ -21,7 +21,8 @@ def __init__(self, policies=None, before_retry=None):
 
     def __iter__(self):
         retrying = Retrying(
-            policies=self.policies.copy(),
+            # change to `list.copy` for more readable when min version of python update to >= 3
+            policies=self.policies[:],
             before_retry=self.before_retry
         )
         retrying.init_context()

tests/cases/conftest.py

@@ -101,3 +101,19 @@ def _rand_string(length):
             for _ in range(length)
         )
     yield _rand_string
+
+
+class Ref:
+    """
+    python2 not support nonlocal keyword
+    """
+    def __init__(self, value=None):
+        self.value = value
+
+
+@pytest.fixture(scope='session')
+def use_ref():
+    def _use_ref(value):
+        return Ref(value)
+
+    yield _use_ref

tests/cases/test_http/test_regions_retry_policy.py

@@ -204,13 +204,13 @@ def test_on_change_region_option(
         self,
         regions,
         service_names,
-        expect_change_region_times
+        expect_change_region_times,
+        use_ref
     ):
-        actual_change_region_times = 0
+        actual_change_region_times_ref = use_ref(0)
 
         def handle_change_region(_context):
-            nonlocal actual_change_region_times
-            actual_change_region_times += 1
+            actual_change_region_times_ref.value += 1
 
         regions_retry_policy = RegionsRetryPolicy(
             regions_provider=regions,
@@ -224,7 +224,7 @@ def handle_change_region(_context):
         while regions_retry_policy.should_retry(mocked_attempt):
             regions_retry_policy.prepare_retry(mocked_attempt)
 
-        assert actual_change_region_times == expect_change_region_times
+        assert actual_change_region_times_ref.value == expect_change_region_times
 
     def test_init_with_preferred_endpoints_option_new_temp_region(self, mocked_regions_provider):
         preferred_endpoints = [

tests/cases/test_retry/test_retrier.py

@@ -28,12 +28,11 @@ def after_retry(self, attempt, policy):
 
 
 class TestRetry:
-    def test_retrier_with_code_block(self):
-        retried_times = 0
+    def test_retrier_with_code_block(self, use_ref):
+        retried_times_ref = use_ref(0)
 
         def handle_before_retry(_attempt, _policy):
-            nonlocal retried_times
-            retried_times += 1
+            retried_times_ref.value += 1
             return True
 
         max_retry_times = 3
@@ -54,14 +53,13 @@ def handle_before_retry(_attempt, _policy):
             assert str(err) == 'mocked error'
 
         assert tried_times == max_retry_times + 1
-        assert retried_times == max_retry_times
+        assert retried_times_ref.value == max_retry_times
 
-    def test_retrier_with_try_do(self):
-        retried_times = 0
+    def test_retrier_with_try_do(self, use_ref):
+        retried_times_ref = use_ref(0)
 
         def handle_before_retry(_attempt, _policy):
-            nonlocal retried_times
-            retried_times += 1
+            retried_times_ref.value += 1
             return True
 
         max_retry_times = 3
@@ -72,26 +70,24 @@ def handle_before_retry(_attempt, _policy):
             before_retry=handle_before_retry
         )
 
-        tried_times = 0
+        tried_times_ref = use_ref(0)
 
         def add_one(n):
-            nonlocal tried_times
-            tried_times += 1
-            if tried_times <= 3:
+            tried_times_ref.value += 1
+            if tried_times_ref.value <= 3:
                 raise Exception('mock error')
             return n + 1
 
         result = retrier.try_do(add_one, 1)
         assert result == 2
-        assert tried_times == max_retry_times + 1
-        assert retried_times == max_retry_times
+        assert tried_times_ref.value == max_retry_times + 1
+        assert retried_times_ref.value == max_retry_times
 
-    def test_retrier_with_decorator(self):
-        retried_times = 0
+    def test_retrier_with_decorator(self, use_ref):
+        retried_times_ref = use_ref(0)
 
         def handle_before_retry(_attempt, _policy):
-            nonlocal retried_times
-            retried_times += 1
+            retried_times_ref.value += 1
             return True
 
         max_retry_times = 3
@@ -102,27 +98,25 @@ def handle_before_retry(_attempt, _policy):
             before_retry=handle_before_retry
         )
 
-        tried_times = 0
+        tried_times_ref = use_ref(0)
 
         @retrier.retry
         def add_one(n):
-            nonlocal tried_times
-            tried_times += 1
-            if tried_times <= 3:
+            tried_times_ref.value += 1
+            if tried_times_ref.value <= 3:
                 raise Exception('mock error')
             return n + 1
 
         result = add_one(1)
         assert result == 2
-        assert tried_times == max_retry_times + 1
-        assert retried_times == max_retry_times
+        assert tried_times_ref.value == max_retry_times + 1
+        assert retried_times_ref.value == max_retry_times
 
-    def test_retrier_with_no_need_retry_err(self):
-        retried_times = 0
+    def test_retrier_with_no_need_retry_err(self, use_ref):
+        retried_times_ref = use_ref(0)
 
         def handle_before_retry(_attempt, _policy):
-            nonlocal retried_times
-            retried_times += 1
+            retried_times_ref.value += 1
             return True
 
         max_retry_times = 3
@@ -145,4 +139,4 @@ def handle_before_retry(_attempt, _policy):
             assert str(err) == 'mocked error'
 
         assert tried_times == 1
-        assert retried_times == 0
+        assert retried_times_ref.value == 0