[CodeStyle][py2] remove six package (part2) (#47334)

* [CodeStyle][py2] remove `six` package (part2)

* six.ensure_str

* remove unused `import six`

* remove six from BUILTIN_LIKELY_MODULES

* remove six in example code

* remove some decode

* try to fix example code

* fix MockEtcdClient get/get_prefix returns data type

* fix MockEtcdClient get_prefix returns data

* fix MockEtcdClient get returns data

* remove `six` in pypi and conda requirements

* fix MockEtcdClient add_watch_callback/add_watch_prefix_callback returns data type

* refine MockEtcdClient

paddle/scripts/conda_build.py

@@ -55,7 +55,6 @@ def __init__(self):
     - protobuf>=3.1.0
     - gast==0.3.3
     - Pillow
-    - six
     - decorator
     - astor
 """
@@ -67,7 +66,6 @@ def __init__(self):
     - protobuf>=3.1.0
     - gast==0.3.3
     - Pillow
-    - six
     - decorator
     - astor
 """

python/paddle/distributed/fleet/elastic/manager.py

@@ -15,7 +15,6 @@
 import time
 import socket
 import os
-import six
 import copy
 import signal
 import random
@@ -244,8 +243,7 @@ def __init__(self, args, etcd_client):
         # register callback
         def host_call_back(event):
             self.hosts = [
-                six.ensure_str(i[0])
-                for i in self.etcd.get_prefix(self.node_prefix)
+                i[0].decode() for i in self.etcd.get_prefix(self.node_prefix)
             ]
             self.hosts = list(set(self.hosts)) if self.hosts else self.hosts
             logger.info(
@@ -266,7 +264,7 @@ def lease_heartbeat():
                     host_lease.refresh()
 
                     hosts = [
-                        six.ensure_str(i[0])
+                        i[0].decode()
                         for i in self.etcd.get_prefix(self.node_prefix)
                     ]
                     hosts = list(set(hosts)) if hosts else hosts
@@ -311,7 +309,8 @@ def lease_heartbeat():
         def endpoints_call_back(event):
             if not self.dist_endpoints:
                 return
-            edps = six.ensure_str(self.etcd.get(self.endpoints_path)[0] or '')
+            value = self.etcd.get(self.endpoints_path)[0]
+            edps = value.decode() if value is not None else ''
             self.dist_endpoints, self.trainers = edps.split('|')
             logger.info(
                 "set DISTRIBUTED_TRAINER_ENDPOINTS {} ".format(
@@ -426,8 +425,7 @@ def _match(self, host_list: list = None):
             self.hosts = host_list
         else:
             self.hosts = [
-                six.ensure_str(i[0])
-                for i in self.etcd.get_prefix(self.node_prefix)
+                i[0].decode() for i in self.etcd.get_prefix(self.node_prefix)
             ]
         self.hosts = list(set(self.hosts)) if self.hosts else self.hosts
 

python/paddle/distributed/launch/controllers/master.py

@@ -17,7 +17,6 @@
 
 import time
 import sys
-import six
 import threading
 import copy
 import random
@@ -214,22 +213,22 @@ def sync_peers(self, prefix, key, value, size, rank=-1) -> (list, int):
 
             if len(result) == size:
                 if rank < 0:
-                    keys = [six.ensure_str(i[1].key) for i in result]
-                    sorted_keys = [six.ensure_str(i[1].key) for i in result]
+                    keys = [i[1].key.decode() for i in result]
+                    sorted_keys = [i[1].key.decode() for i in result]
                     sorted_keys.sort()
-                    values = [six.ensure_str(i[0]) for i in result]
+                    values = [i[0].decode() for i in result]
                     ret = [values[keys.index(k)] for k in sorted_keys]
                     idx = ret.index(value)
                     return ret, idx
                 else:
                     ret = [None] * size
                     for v, k in result:
-                        ii = int(six.ensure_str(k.key).split('/')[-1])
+                        ii = int(k.key.decode().split('/')[-1])
                         if ii < 0:
                             self.ctx.logger.error(
                                 "rank {} error in sync".format(ii)
                             )
-                        ret[ii] = six.ensure_str(v)
+                        ret[ii] = v.decode()
                     return ret, rank
             else:
                 time.sleep(0.5)
@@ -278,8 +277,7 @@ def _heartbeat():
 
     def fetch_peer_alive(self):
         peer_alive = [
-            six.ensure_str(i[0])
-            for i in self.client.get_prefix(self.heartbeat_prefix)
+            i[0].decode() for i in self.client.get_prefix(self.heartbeat_prefix)
         ]
         self.ctx.logger.debug("peer alive {}".format(peer_alive))
         return peer_alive
@@ -319,7 +317,8 @@ def set_status(self, status):
         ), "set status failed {}".format(status)
 
     def get_status(self):
-        return six.ensure_str(self.client.get(self.job_prefix)[0] or '')
+        value = self.client.get(self.job_prefix)[0]
+        return value.decode() if value is not None else ''
 
     def stop(self):
         if hasattr(self, 'beat_thread'):

python/paddle/fluid/contrib/slim/quantization/imperative/ptq_quantizer.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
 import abc
 import copy
 import math

python/paddle/fluid/dataloader/dataloader_iter.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-import six
 import sys
 import time
 import signal
@@ -284,9 +283,9 @@ def _thread_loop(self, legacy_expected_place):
                 except:
                     self._exit_thread_expectedly()
 
-            except:
+            except Exception as e:
                 self._exit_thread_unexpectedly()
-                six.reraise(*sys.exc_info())
+                raise e
 
         self._exit_thread_expectedly()
 
@@ -334,7 +333,7 @@ def __next__(self):
         except StopIteration:
             self._reader.shutdown()
             self._try_shutdown_all()
-            six.reraise(*sys.exc_info())
+            raise
         finally:
             if in_profiler_mode():
                 trace_event.end()
@@ -629,7 +628,7 @@ def _thread_loop(self, legacy_expected_place):
                             self._blocking_queue.close()
                     except Exception as e:
                         self._exit_thread_unexpectedly()
-                        six.reraise(*sys.exc_info())
+                        raise e
                     finally:
                         self._rcvd_idx += 1
 
@@ -715,7 +714,7 @@ def _get_data(self):
                     "DataLoader reader thread failed({}) to read data from "
                     "workers' result queue.".format(e)
                 )
-                six.reraise(*sys.exc_info())
+                raise e
             else:
                 if self._dataset_kind == _DatasetKind.ITER and isinstance(
                     data, _IterableDatasetStopIteration
@@ -850,7 +849,7 @@ def __next__(self):
             if not self._persistent_workers:
                 self._reader.shutdown()
                 self._try_shutdown_all()
-            six.reraise(*sys.exc_info())
+            raise
         finally:
             if in_profiler_mode():
                 trace_event.end()

python/paddle/fluid/dataloader/worker.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os
-import six
 import sys
 import paddle
 import numpy as np
@@ -395,7 +394,7 @@ def tensor_share_memory(tensor):
         # NOTE: Main process will raise KeyboardInterrupt anyways, ignore it in child process
         pass
     except:
-        six.reraise(*sys.exc_info())
+        raise
     finally:
         if use_shared_memory:
             _cleanup_mmap()

python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py

@@ -22,7 +22,6 @@
 import types
 
 import numpy
-import six
 import builtins
 
 from paddle.fluid.dygraph.container import Sequential
@@ -58,7 +57,6 @@
     copy,
     inspect,
     re,
-    six,
     numpy,
     logging,
 ]

python/paddle/fluid/executor.py

@@ -19,7 +19,6 @@
 import warnings
 import numpy as np
 from .wrapped_decorator import signature_safe_contextmanager
-import six
 from .data_feeder import convert_dtype
 from .framework import Program, default_main_program, Variable, Operator
 from .framework import convert_np_dtype_to_dtype_, _apply_pass
@@ -1574,23 +1573,20 @@ def run(
             ]
             self._log_force_set_program_cache(use_program_cache)
 
-        try:
-            res = self._run_impl(
-                program=program,
-                feed=feed,
-                fetch_list=fetch_list,
-                feed_var_name=feed_var_name,
-                fetch_var_name=fetch_var_name,
-                scope=scope,
-                return_numpy=return_numpy,
-                use_program_cache=use_program_cache,
-                use_prune=use_prune,
-                return_merged=return_merged,
-            )
-            core.update_autotune_status()
-            return res
-        except Exception as e:
-            six.reraise(*sys.exc_info())
+        res = self._run_impl(
+            program=program,
+            feed=feed,
+            fetch_list=fetch_list,
+            feed_var_name=feed_var_name,
+            fetch_var_name=fetch_var_name,
+            scope=scope,
+            return_numpy=return_numpy,
+            use_program_cache=use_program_cache,
+            use_prune=use_prune,
+            return_merged=return_merged,
+        )
+        core.update_autotune_status()
+        return res
 
     def _run_impl(
         self,

python/paddle/fluid/framework.py

@@ -5777,10 +5777,10 @@ def clone(self, for_test=False):
 
             .. code-block:: python
 
-                import six
+                import paddle
 
                 def print_prog(prog):
-                    for name, value in sorted(six.iteritems(prog.block(0).vars)):
+                    for name, value in sorted(prog.block(0).vars.items()):
                         print(value)
                     for op in prog.block(0).ops:
                         print("op type is {}".format(op.type))

python/paddle/fluid/incubate/fleet/parameter_server/ir/public.py

@@ -19,7 +19,6 @@
 import os
 import warnings
 import logging
-import six
 import paddle.fluid as fluid
 from paddle.fluid import core
 from paddle.fluid.core import CommContext

python/paddle/fluid/layers/io.py

@@ -14,7 +14,6 @@
 
 import multiprocessing
 import os
-import six
 import sys
 import threading
 
@@ -523,10 +522,10 @@ def __provider_thread__(legacy_expected_place):
                     if reader.exited:
                         break
                 feed_queue.close()
-            except Exception as ex:
+            except Exception as e:
                 feed_queue.kill()
                 logging.warn('Your decorated reader has raised an exception!')
-                six.reraise(*sys.exc_info())
+                raise e
 
         reader.thread = threading.Thread(
             target=__provider_thread__, args=(_current_expected_place(),)

python/paddle/fluid/layers/nn.py

@@ -14998,7 +14998,6 @@ def py_func(func, x, out, backward_func=None, skip_vars_in_backward_input=None):
 
             # example 1:
             import paddle
-            import six
             import numpy as np
 
             paddle.enable_static()
@@ -15024,7 +15023,7 @@ def create_tmp_var(name, dtype, shape):
 
             def simple_net(img, label):
                 hidden = img
-                for idx in six.moves.range(4):
+                for idx in range(4):
                     hidden = paddle.static.nn.fc(hidden, size=200)
                     new_hidden = create_tmp_var(name='hidden_{}'.format(idx),
                         dtype=hidden.dtype, shape=hidden.shape)
@@ -15042,13 +15041,13 @@ def simple_net(img, label):
                 return ce_loss(prediction, label)
 
             x = paddle.static.data(name='x', shape=[1,4], dtype='float32')
-            y = paddle.static.data(name='y', shape=[1,10], dtype='int64')
+            y = paddle.static.data(name='y', shape=[1], dtype='int64')
             res = simple_net(x, y)
 
             exe = paddle.static.Executor(paddle.CPUPlace())
             exe.run(paddle.static.default_startup_program())
             input1 = np.random.random(size=[1,4]).astype('float32')
-            input2 = np.random.randint(1, 10, size=[1,10], dtype='int64')
+            input2 = np.random.randint(1, 10, size=[1], dtype='int64')
             out = exe.run(paddle.static.default_main_program(),
                           feed={'x':input1, 'y':input2},
                           fetch_list=[res.name])

python/paddle/fluid/layers/utils.py

@@ -14,7 +14,6 @@
 
 import collections
 import copy
-import six
 import numpy as np
 from ..framework import Block, Variable, _non_static_mode
 from ..data_feeder import (