From 30169653745d6e629dfab6e13538868e04d44c7e Mon Sep 17 00:00:00 2001 From: Abhishek Arya Date: Tue, 16 Apr 2019 14:13:53 -0700 Subject: [PATCH] Finish futurize Py2->3 stage 1, use absolute imports. (#387) Absolute imports are used since libFuzzer, AFL launchers and ml/rnn/generate,train scripts are launched as new python processes and relative imports don't work in non-packages. --- src/python/bot/fuzzers/afl/launcher.py | 8 ++++---- src/python/bot/fuzzers/afl/stats.py | 3 +-- src/python/bot/fuzzers/libFuzzer/fuzzer.py | 3 +-- src/python/bot/fuzzers/libFuzzer/launcher.py | 4 ++-- src/python/bot/fuzzers/libFuzzer/stats.py | 4 +--- src/python/bot/fuzzers/libfuzzer.py | 5 ++--- src/python/bot/fuzzers/ml/rnn/generate.py | 8 ++++---- src/python/bot/fuzzers/ml/rnn/generator.py | 3 +-- src/python/bot/fuzzers/ml/rnn/train.py | 9 +++++---- src/python/bot/fuzzers/ml/rnn/utils.py | 4 ++-- 10 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/python/bot/fuzzers/afl/launcher.py b/src/python/bot/fuzzers/afl/launcher.py index 8a7ca46b7f9..7a80a92cbc3 100755 --- a/src/python/bot/fuzzers/afl/launcher.py +++ b/src/python/bot/fuzzers/afl/launcher.py @@ -35,17 +35,17 @@ from bot.fuzzers import engine_common from bot.fuzzers import options from bot.fuzzers import utils as fuzzer_utils +from bot.fuzzers.afl import constants +from bot.fuzzers.afl import stats +from bot.fuzzers.afl import strategies +from bot.fuzzers.afl.fuzzer import write_dummy_file from datastore import data_types -from fuzzer import write_dummy_file from metrics import logs from metrics import profiler from system import environment from system import minijail from system import new_process from system import shell -import constants -import stats -import strategies # Allow 30 minutes to merge the testcases back into the corpus. This matches # libFuzzer's merge timeout. diff --git a/src/python/bot/fuzzers/afl/stats.py b/src/python/bot/fuzzers/afl/stats.py index eb6e54b3868..4115224ce84 100644 --- a/src/python/bot/fuzzers/afl/stats.py +++ b/src/python/bot/fuzzers/afl/stats.py @@ -17,10 +17,9 @@ import os import re -import strategies - from bot.fuzzers import dictionary_manager from bot.fuzzers import engine_common +from bot.fuzzers.afl import strategies from metrics import logs SANITIZER_START_REGEX = re.compile(r'.*ERROR: [A-z]+Sanitizer:.*') diff --git a/src/python/bot/fuzzers/libFuzzer/fuzzer.py b/src/python/bot/fuzzers/libFuzzer/fuzzer.py index 82887fd21aa..e1962ffbe1e 100755 --- a/src/python/bot/fuzzers/libFuzzer/fuzzer.py +++ b/src/python/bot/fuzzers/libFuzzer/fuzzer.py @@ -12,10 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. """libFuzzer fuzzer.""" -import constants - from bot.fuzzers import builtin from bot.fuzzers import options +from bot.fuzzers.libFuzzer import constants class LibFuzzer(builtin.EngineFuzzer): diff --git a/src/python/bot/fuzzers/libFuzzer/launcher.py b/src/python/bot/fuzzers/libFuzzer/launcher.py index 5984eacb354..828058b1654 100755 --- a/src/python/bot/fuzzers/libFuzzer/launcher.py +++ b/src/python/bot/fuzzers/libFuzzer/launcher.py @@ -40,6 +40,8 @@ from bot.fuzzers import mutator_plugin from bot.fuzzers import strategy from bot.fuzzers import utils as fuzzer_utils +from bot.fuzzers.libFuzzer import constants +from bot.fuzzers.libFuzzer import stats from bot.fuzzers.ml.rnn import generator as ml_rnn_generator from datastore import data_types from metrics import logs @@ -48,8 +50,6 @@ from system import minijail from system import new_process from system import shell -import constants -import stats # Regex to find testcase path from a crash. CRASH_TESTCASE_REGEX = (r'.*Test unit written to\s*' diff --git a/src/python/bot/fuzzers/libFuzzer/stats.py b/src/python/bot/fuzzers/libFuzzer/stats.py index a8d0408502d..bf25c0baa80 100755 --- a/src/python/bot/fuzzers/libFuzzer/stats.py +++ b/src/python/bot/fuzzers/libFuzzer/stats.py @@ -12,14 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. """Performance stats constants and helpers for libFuzzer.""" - import re -import constants - from bot.fuzzers import dictionary_manager from bot.fuzzers import strategy from bot.fuzzers import utils as fuzzer_utils +from bot.fuzzers.libFuzzer import constants from crash_analysis.stack_parsing import stack_analyzer from metrics import logs diff --git a/src/python/bot/fuzzers/libfuzzer.py b/src/python/bot/fuzzers/libfuzzer.py index 9aef1404930..30efda1059c 100644 --- a/src/python/bot/fuzzers/libfuzzer.py +++ b/src/python/bot/fuzzers/libfuzzer.py @@ -12,14 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. """libFuzzer runners.""" - import copy -import engine_common import os import shutil from base import retry -from libFuzzer import constants +from bot.fuzzers import engine_common +from bot.fuzzers.libFuzzer import constants from platforms import fuchsia from system import environment from system import minijail diff --git a/src/python/bot/fuzzers/ml/rnn/generate.py b/src/python/bot/fuzzers/ml/rnn/generate.py index 0802d938722..7084fc98997 100755 --- a/src/python/bot/fuzzers/ml/rnn/generate.py +++ b/src/python/bot/fuzzers/ml/rnn/generate.py @@ -16,14 +16,14 @@ import argparse import math +import numpy as np import os import sys +import tensorflow as tf import time -import constants -import numpy as np -import tensorflow as tf -import utils +from bot.fuzzers.ml.rnn import constants +from bot.fuzzers.ml.rnn import utils # Reset batch_size for generation: generate multiple inputs in each run. BATCH_SIZE = 50 diff --git a/src/python/bot/fuzzers/ml/rnn/generator.py b/src/python/bot/fuzzers/ml/rnn/generator.py index f4fdee9e657..561a85eccd2 100644 --- a/src/python/bot/fuzzers/ml/rnn/generator.py +++ b/src/python/bot/fuzzers/ml/rnn/generator.py @@ -22,14 +22,13 @@ import os +from bot.fuzzers.ml.rnn import constants from google_cloud_utils import storage from metrics import logs from system import environment from system import new_process from system import shell -import constants - # Model script directory absolute path. ML_RNN_SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__)) diff --git a/src/python/bot/fuzzers/ml/rnn/train.py b/src/python/bot/fuzzers/ml/rnn/train.py index 32d9f9a4ddb..838b646b80d 100755 --- a/src/python/bot/fuzzers/ml/rnn/train.py +++ b/src/python/bot/fuzzers/ml/rnn/train.py @@ -16,16 +16,17 @@ import argparse import math +import numpy as np import os import sys +import tensorflow as tf import time -import constants -import numpy as np -import tensorflow as tf from tensorflow.contrib import layers from tensorflow.contrib import rnn -import utils + +from bot.fuzzers.ml.rnn import constants +from bot.fuzzers.ml.rnn import utils # Training suggestions # diff --git a/src/python/bot/fuzzers/ml/rnn/utils.py b/src/python/bot/fuzzers/ml/rnn/utils.py index 83ca35daac5..ec994b5d26e 100644 --- a/src/python/bot/fuzzers/ml/rnn/utils.py +++ b/src/python/bot/fuzzers/ml/rnn/utils.py @@ -14,12 +14,12 @@ """Utility functions for ml rnn model.""" from __future__ import print_function +import numpy as np import os import random import sys -import constants -import numpy as np +from bot.fuzzers.ml.rnn import constants def validate_model_path(model_path):