Merge pull request #92 from ybx0505/master

change some varibles

Author: wh0am1i

zoomeye/cli.py

@@ -219,8 +219,9 @@ def main():
     parser_domain.set_defaults(func=core.associated_domain_query)
 
     args = parser.parse_args()
+    ver=args.version()
 
-    if args.version:
+    if ver:
         get_version()
         exit(0)
 

zoomeye/data.py

@@ -162,10 +162,10 @@ def regexp(keys, field_table, data_list):
     return result
 
 
-def filter_search_data(keys, field_table, data):
+def filter_search_data(datakeys, field_table, data):
     """
     get the data of the corresponding field
-    :param keys: list, user input field
+    :param datakeys: list, user input field
     :param field_table: dict, fileds
     :param data: list, zoomeye api data
     :return: list, ex: [[1,2,3...],[1,2,3...],[1,2,3...]...]
@@ -174,7 +174,7 @@ def filter_search_data(keys, field_table, data):
     for d in data:
         item = []
         zmdict = ZoomEyeDict(d)
-        for key in keys:
+        for key in datakeys:
             if field_table.get(key.strip()) is None:
                 support_fields = ','.join(list(field_table.keys()))
                 show.printf("filter command has unsupport fields [{}], support fields has [{}]"

zoomeye/show.py

@@ -427,7 +427,7 @@ def print_info_filter(filters, raw_data, condition=None):
         printf(content)
 
 
-def show_domain_info(info_list, total, page):
+def show_domain_info(information_list, total, page):
     """
     show query domain info
     Args:
@@ -437,10 +437,10 @@ def show_domain_info(info_list, total, page):
         None
     """
 
-    if len(info_list) == 0:
+    if len(information_list) == 0:
         return
     printf("{:<55}{:<15}{:<25}".format("name", "timestamp", "ip"), color="green")
-    for d in info_list:
+    for d in information_list:
         name, timestamp, ip = d.values()
         printf("{:<55}{:<15}{:<25}".format(name, timestamp, json.dumps(ip)))
     print()