update comments

(cherry picked from commit 34b5b2e)

Author: yimelia

airtest/core/android/adb.py

@@ -461,7 +461,7 @@ def push(self, local, remote):
         if os.path.isfile(local) and os.path.splitext(local)[-1] != os.path.splitext(remote)[-1]:
             # If remote is a folder, add the filename and escape
             filename = os.path.basename(local)
-            # 把文件名中的空格、括号等符号，添加转义符，以便adb push后的文件名正确
+            # Add escape characters for spaces, parentheses, etc. in filenames
             filename = re.sub(r"[ \(\)\&]", lambda m: "\\" + m.group(0), filename)
             remote = '%s/%s' % (remote, filename)
         self.cmd(["push", local, remote], ensure_unicode=False)
@@ -677,8 +677,6 @@ def pm_install(self, filepath, replace=False, install_options=None):
 
         Note:
             This is more reliable and recommended way of installing `.apk` files
-            Do not use filenames with spaces
-            请勿使用带空格的文件名！
 
         Args:
             filepath: full path to file to be installed on the device

airtest/core/android/cap_methods/javacap.py

@@ -70,7 +70,8 @@ def get_frames(self):
         try:
             t = s.recv(24)
         except Exception as e:
-            # 在部分手机上，可能连接可以成功建立，但是在开始获取数据时会报错
+            # On some phones, the connection can be established successfully,
+            # but an error is reported when starting to fetch data
             raise ScreenError(e)
         # javacap header
         LOGGING.debug(struct.unpack("<2B5I2B", t))
@@ -117,7 +118,6 @@ def _cleanup(self):
         """
         Cleanup javacap process and stream reader
 
-        和minicap类似
         Returns:
 
         """

airtest/core/android/cap_methods/minicap.py

@@ -60,7 +60,7 @@ def __init__(self, adb, projection=None, rotation_watcher=None, display_id=None,
             # minicap需要在横竖屏转换时，重新连接
             rotation_watcher.reg_callback(lambda x: self.update_rotation(x * 90))
         self.cleanup_func = []
-        # 默认的清理操作，在退出时断开连接
+        # Force cleanup on exit
         reg_cleanup(self.teardown_stream)
 
     @ready_method
@@ -262,8 +262,9 @@ def _get_stream(self, lazy=True):
                 s.send(b"1")
             # recv frame header, count frame_size
             if self.RECVTIMEOUT is not None:
-                # 部分手机在横竖屏切换时，可能会卡在这里一直等待recv数据，导致旧的minicap进程未完全结束
-                # 这可能会使新的minicap拿到的画面只有一半，另外一半黑屏，因此1.2.7以上版本强制设置超时时间为3s
+                # Some mobile phones may keep waiting for data when switching between horizontal and vertical screens,
+                # and the connection is not closed, resulting in a black screen
+                # Set the timeout to 3s(airtest>=1.2.7)
                 header = s.recv_with_timeout(4, self.RECVTIMEOUT)
             else:
                 header = s.recv(4)
@@ -280,8 +281,8 @@ def _get_stream(self, lazy=True):
                 stopping = yield frame_data
 
         LOGGING.debug("minicap stream ends")
-        # 这里只调用_cleanup()，清理掉本次连接创建的进程即可
-        # 不直接调用teardown_stream()，因为在屏幕旋转时可能会多次重建连接，self.frame_gen可能会卡住
+        # teardown stream() cannot be called directly because the connection may be rebuilt multiple times
+        # while the screen is rotated, and self.frame_gen gets stuck
         self._cleanup()
 
     def _setup_stream_server(self, lazy=False):
@@ -387,6 +388,7 @@ def _cleanup(self):
 
         主动将minicap建立的各个连接关闭
         与snippet.py中的CLEANUP_CALLS功能相同，但是允许主动调用，避免异常退出时有遗漏进程没清理干净
+
         Returns:
 
         """
@@ -402,7 +404,7 @@ def teardown_stream(self):
             None
 
         """
-        # 主动清理一次之前建立的连接
+        # clean up established connections
         self._cleanup()
         if not self.frame_gen:
             return

airtest/core/api.py

@@ -14,7 +14,7 @@
 from airtest.core.helper import (G, delay_after_operation, import_device_cls,
                                  logwrap, set_logdir, using, log)
 # Assertions
-from airtest.core.assertions import (assert_exists, assert_not_exists, assert_equal, assert_not_equal,
+from airtest.core.assertions import (assert_exists, assert_not_exists, assert_equal, assert_not_equal,  # noqa
                                         assert_true, assert_false, assert_is, assert_is_not,
                                         assert_is_none, assert_is_not_none, assert_in, assert_not_in,
                                         assert_is_instance, assert_not_is_instance