代码退场，清除了与python2相关的一些条件分支 (#46696)

python/paddle/fluid/layers/rnn.py

@@ -126,43 +126,27 @@ class RNNCell(object):
             Variable: tensor variable[s] packed in the same structure provided \
                 by shape, representing the initialized states.
         """
-        if sys.version_info < (3, ):
-            integer_types = (
-                int,
-                long,
-            )
-        else:
-            integer_types = (int, )
         check_variable_and_dtype(batch_ref, 'batch_ref',
                                  ['float32', 'float64', 'int32', 'int64'],
                                  'RNNCell')
-        check_type(shape, 'shape', (list, tuple, type(None), integer_types),
-                   'RNNCell')
+        check_type(shape, 'shape', (list, tuple, type(None), int), 'RNNCell')
         if isinstance(shape, (list, tuple)):
             shapes = map_structure(lambda x: x, shape)
             if isinstance(shape, list):
                 for i, _shape in enumerate(shapes):
-                    check_type(_shape, 'shapes[' + str(i) + ']', integer_types,
-                               'RNNCell')
+                    check_type(_shape, 'shapes[' + str(i) + ']', int, 'RNNCell')
             else:
-                check_type(shapes, 'shapes', integer_types, 'RNNCell')
+                check_type(shapes, 'shapes', int, 'RNNCell')
         check_dtype(dtype, 'dtype', ['float32', 'float64'], 'RNNCell')
 
         # TODO: use inputs and batch_size
         batch_ref = flatten(batch_ref)[0]
 
         def _is_shape_sequence(seq):
-            if sys.version_info < (3, ):
-                integer_types = (
-                    int,
-                    long,
-                )
-            else:
-                integer_types = (int, )
             """For shape, list/tuple of integer is the finest-grained objection"""
             if (isinstance(seq, list) or isinstance(seq, tuple)):
-                if reduce(lambda flag, x: isinstance(x, integer_types) and flag,
-                          seq, True):
+                if reduce(lambda flag, x: isinstance(x, int) and flag, seq,
+                          True):
                     return False
             # TODO: Add check for the illegal
             if isinstance(seq, dict):

python/paddle/fluid/param_attr.py

@@ -84,9 +84,6 @@ class ParamAttr(object):
                  do_model_average=True,
                  need_clip=True):
 
-        if sys.version_info.major == 2:
-            check_type(name, "name", (str, type(None), unicode), "ParamAttr")
-        else:
         check_type(name, "name", (str, type(None)), "ParamAttr")
         check_type(learning_rate, "learning_rate", (float, int), "ParamAttr")
         check_type(trainable, "trainable", (bool), "ParamAttr")

python/paddle/fluid/tests/unittests/test_fs_interface.py

@@ -26,9 +26,6 @@ from paddle.distributed.fleet.utils.fs import LocalFS, FS, HDFSClient, FSTimeOut
 class FSTest(unittest.TestCase):
 
     def _test_method(self, func):
-        if sys.version_info[0] <= 2:
-            args = inspect.getargspec(func).args
-        else:
         args = inspect.getfullargspec(func).args
 
         a = None

python/paddle/fluid/tests/unittests/test_imperative_data_loader_exit_func.py

@@ -21,10 +21,7 @@ import time
 import paddle.compat as cpt
 from paddle.fluid.framework import _test_eager_guard
 
-if sys.version_info[0] == 2:
-    import Queue as queue
-else:
-    import queue
+import queue
 
 from paddle.fluid.reader import multiprocess_queue_set, _cleanup, CleanupFuncRegistrar
 

python/paddle/fluid/tests/unittests/test_imperative_data_loader_process.py

@@ -21,10 +21,7 @@ from paddle.fluid import core
 from paddle.fluid.reader import _reader_process_loop
 from paddle.fluid.framework import _test_eager_guard
 
-if sys.version_info[0] == 2:
-    import Queue as queue
-else:
-    import queue
+import queue
 
 
 def get_random_images_and_labels(image_shape, label_shape):

python/paddle/nn/layer/rnn.py

@@ -188,17 +188,10 @@ class RNNCellBase(Layer):
         batch_ref = flatten(batch_ref)[0]
 
         def _is_shape_sequence(seq):
-            if sys.version_info < (3, ):
-                integer_types = (
-                    int,
-                    long,
-                )
-            else:
-                integer_types = (int, )
             """For shape, list/tuple of integer is the finest-grained objection"""
             if (isinstance(seq, list) or isinstance(seq, tuple)):
-                if reduce(lambda flag, x: isinstance(x, integer_types) and flag,
-                          seq, True):
+                if reduce(lambda flag, x: isinstance(x, int) and flag, seq,
+                          True):
                     return False
             # TODO: Add check for the illegal
             if isinstance(seq, dict):

python/paddle/tests/test_callback_visualdl.py

@@ -47,10 +47,6 @@ class TestCallbacks(unittest.TestCase):
         shutil.rmtree(self.save_dir)
 
     def func_visualdl_callback(self):
-        # visualdl not support python2
-        if sys.version_info < (3, ):
-            return
-
         inputs = [InputSpec([-1, 1, 28, 28], 'float32', 'image')]
         labels = [InputSpec([None, 1], 'int64', 'label')]
 

python/setup.py.in

@@ -735,12 +735,8 @@ else:
         yield
 
 # Log for PYPI
-if sys.version_info > (3,0):
-    with open("@PADDLE_BINARY_DIR@/python/paddle/README.rst", "r", encoding='UTF-8') as f:
+with open("@PADDLE_BINARY_DIR@/python/paddle/README.rst", "r", encoding='UTF-8') as f:
     long_description = f.read()
-else:
-    with open("@PADDLE_BINARY_DIR@/python/paddle/README.rst", "r")as f:
-        long_description = unicode(f.read(), 'UTF-8')
 
 # strip *.so to reduce package size
 if '${WITH_STRIP}' == 'ON':

tools/prune_for_jetson.py

@@ -54,18 +54,11 @@ def find_kernel(content, pattern):
 
 def prune_phi_kernels():
     tool_dir = os.path.dirname(os.path.abspath(__file__))
-    if sys.version_info[0] == 3:
-        all_op = glob.glob(os.path.join(tool_dir,
-                                        '../paddle/phi/kernels/**/*.cc'),
+
+    all_op = glob.glob(os.path.join(tool_dir, '../paddle/phi/kernels/**/*.cc'),
                        recursive=True)
-        all_op += glob.glob(os.path.join(tool_dir,
-                                         '../paddle/phi/kernels/**/*.cu'),
+    all_op += glob.glob(os.path.join(tool_dir, '../paddle/phi/kernels/**/*.cu'),
                         recursive=True)
-    elif sys.version_info[0] == 2:
-        all_op = find_type_files(
-            os.path.join(tool_dir, '../paddle/phi/kernels/'), '.cc')
-        all_op = find_type_files(
-            os.path.join(tool_dir, '../paddle/phi/kernels/'), '.cu', all_op)
 
     register_op_count = 0
     for op_file in all_op:
@@ -139,18 +132,12 @@ def append_fluid_kernels():
     #2. add op and kernel register
     op_white_list.append("tensorrt_engine")
     tool_dir = os.path.dirname(os.path.abspath(__file__))
-    if sys.version_info[0] == 3:
     all_op = glob.glob(os.path.join(tool_dir,
                                     '../paddle/fluid/operators/**/*.cc'),
                        recursive=True)
     all_op += glob.glob(os.path.join(tool_dir,
                                      '../paddle/fluid/operators/**/*.cu'),
                         recursive=True)
-    elif sys.version_info[0] == 2:
-        all_op = find_type_files(
-            os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cc')
-        all_op = find_type_files(
-            os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cu', all_op)
 
     for op_file in all_op:
         with io.open(op_file, 'r', encoding='utf-8') as f:

tools/remove_grad_op_and_kernel.py

@@ -67,18 +67,12 @@ if __name__ == '__main__':
 
     tool_dir = os.path.dirname(os.path.abspath(__file__))
 
-    if sys.version_info[0] == 3:
     all_op = glob.glob(os.path.join(tool_dir,
                                     '../paddle/fluid/operators/**/*.cc'),
                        recursive=True)
     all_op += glob.glob(os.path.join(tool_dir,
                                      '../paddle/fluid/operators/**/*.cu'),
                         recursive=True)
-    elif sys.version_info[0] == 2:
-        all_op = find_type_files(
-            os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cc')
-        all_op = find_type_files(
-            os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cu', all_op)
 
     spec_ops = ['activation_op.cc']