From 3ce0322fe7c825f8688545c47434c7404aff5f5a Mon Sep 17 00:00:00 2001
From: akun <6awkun@gmail.com>
Date: Wed, 7 Mar 2018 18:44:13 +0800
Subject: [PATCH] Refactoring for Python 3 `idioms`

* 2to3 `ls | grep -v thirdparty` -f idioms
---
 lib/core/common.py  | 3 +--
 lib/core/option.py  | 3 +--
 lib/core/testing.py | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 3be821a2b..84f10fe44 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1525,8 +1525,7 @@ def expandAsteriskForColumns(expression):
         columnsDict = conf.dbmsHandler.getColumns(onlyColNames=True)
 
         if columnsDict and conf.db in columnsDict and conf.tbl in columnsDict[conf.db]:
-            columns = columnsDict[conf.db][conf.tbl].keys()
-            columns.sort()
+            columns = sorted(columnsDict[conf.db][conf.tbl].keys())
             columnsStr = ", ".join(column for column in columns)
             expression = expression.replace('*', columnsStr, 1)
 
diff --git a/lib/core/option.py b/lib/core/option.py
index f8254914f..0796d19d2 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -430,8 +430,7 @@ def _setMultipleTargets():
         _feedTargetsDict(conf.logFile, addedTargetUrls)
 
     elif os.path.isdir(conf.logFile):
-        files = os.listdir(conf.logFile)
-        files.sort()
+        files = sorted(os.listdir(conf.logFile))
 
         for reqFile in files:
             if not re.search(r"([\d]+)\-request", reqFile):
diff --git a/lib/core/testing.py b/lib/core/testing.py
index c7024832c..5347ed4a5 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -98,7 +98,7 @@ def smokeTest():
 def adjustValueType(tagName, value):
     for family in optDict.keys():
         for name, type_ in optDict[family].items():
-            if type(type_) == tuple:
+            if isinstance(type_, tuple):
                 type_ = type_[0]
             if tagName == name:
                 if type_ == "boolean":