Merge pull request #1333 from hereischen/6-python-file

Python 3: [generic] replaced file() with open()

generic/tests/trans_hugepage_defrag.py

@@ -31,10 +31,11 @@ def run(test, params, env):
 
         :param param: Memory parameter.
         """
-        for line in file('/proc/meminfo', 'r').readlines():
-            if line.startswith("%s" % param):
-                output = re.split(r'\s+', line)[1]
-        return int(output)
+        with open('/proc/meminfo', 'r') as f:
+            for line in f.readlines():
+                if line.startswith("%s" % param):
+                    output = re.split(r'\s+', line)[1]
+            return int(output)
 
     def set_libhugetlbfs(number):
         """
@@ -43,17 +44,16 @@ def run(test, params, env):
         :param number: Number of pages (either string or numeric).
         """
         logging.info("Trying to setup %d hugepages on host", number)
-        f = file("/proc/sys/vm/nr_hugepages", "w+")
-        pre_ret = f.read()
-        logging.debug("Number of huge pages on libhugetlbfs (pre-write): %s" %
-                      pre_ret.strip())
-        f.write(str(number))
-        f.seek(0)
-        ret = f.read()
-        logging.debug(
-            "Number of huge pages on libhugetlbfs: (post-write): %s" %
-            ret.strip())
-        return int(ret)
+        with open("/proc/sys/vm/nr_hugepages", "w+") as f:
+            pre_ret = f.read()
+            logging.debug("Number of huge pages on libhugetlbfs"
+                          " (pre-write): %s" % pre_ret.strip())
+            f.write(str(number))
+            f.seek(0)
+            ret = f.read()
+            logging.debug("Number of huge pages on libhugetlbfs:"
+                          " (post-write): %s" % ret.strip())
+            return int(ret)
 
     def change_feature_status(test, status, feature_path, test_config):
         """

generic/tests/trans_hugepage_swapping.py

@@ -22,10 +22,11 @@ def run(test, params, env):
         Get the memory arguments from system
         """
         args_list_tmp = args_list.copy()
-        for line in file('/proc/meminfo', 'r').readlines():
-            for key in args_list_tmp.keys():
-                if line.startswith("%s" % args_list_tmp[key]):
-                    args_list_tmp[key] = int(re.split(r'\s+', line)[1])
+        with open('/proc/meminfo', 'r') as f:
+            for line in f.readlines():
+                for key in args_list_tmp.keys():
+                    if line.startswith("%s" % args_list_tmp[key]):
+                        args_list_tmp[key] = int(re.split(r'\s+', line)[1])
         return args_list_tmp
 
     try: