Skip to content

Commit 38308d7

Browse files
author
Juliya Smith
authored
Fix mock error logger and optimize imports (#10)
1 parent 77f6737 commit 38308d7

File tree

14 files changed

+27
-22
lines changed

14 files changed

+27
-22
lines changed

src/code42cli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from code42cli.main import main
1+

src/code42cli/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from argparse import ArgumentParser
22

3+
import code42cli.securitydata.main as securitydata
34
from code42cli.compat import str
45
from code42cli.profile import profile
5-
import code42cli.securitydata.main as securitydata
66

77

88
def main():

src/code42cli/profile/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from __future__ import print_function
2+
23
import os
34
from configparser import ConfigParser
45

5-
from code42cli.compat import str
66
import code42cli.util as util
7-
7+
from code42cli.compat import str
88

99
_DEFAULT_VALUE = u"__DEFAULT__"
1010

src/code42cli/profile/password.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from __future__ import print_function
2-
import keyring
2+
33
from getpass import getpass
44

5+
import keyring
6+
57
import code42cli.profile.config as config
68
from code42cli.profile.config import ConfigurationKeys
79

8-
910
_ROOT_SERVICE_NAME = u"code42cli"
1011

1112

src/code42cli/securitydata/cursor_store.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from __future__ import with_statement
2+
23
import sqlite3
34

45
from code42cli.util import get_user_project_path

src/code42cli/securitydata/date_helper.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from datetime import datetime, timedelta
2+
23
from c42eventextractor.common import convert_datetime_to_timestamp
34
from py42.sdk.file_event_query.event_query import EventTimestamp
45

src/code42cli/securitydata/extraction.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
from __future__ import print_function
2+
23
import json
3-
from py42.sdk import SDK
4-
from py42 import debug_level
5-
from py42 import settings
4+
65
from c42eventextractor import FileEventHandlers
76
from c42eventextractor.extractors import FileEventExtractor
7+
from py42 import debug_level
8+
from py42 import settings
9+
from py42.sdk import SDK
810
from py42.sdk.file_event_query.cloud_query import Actor
911
from py42.sdk.file_event_query.device_query import DeviceUsername
1012
from py42.sdk.file_event_query.event_query import Source
1113
from py42.sdk.file_event_query.exposure_query import ExposureType, ProcessOwner, TabURL
1214
from py42.sdk.file_event_query.file_query import MD5, SHA256, FileName, FilePath
1315

1416
from code42cli.compat import str
15-
from code42cli.util import print_error, print_bold, is_interactive
1617
from code42cli.profile.profile import get_profile
17-
from code42cli.securitydata.options import ExposureType as ExposureTypeOptions
1818
from code42cli.securitydata import date_helper as date_helper
19+
from code42cli.securitydata.arguments.main import IS_INCREMENTAL_KEY
20+
from code42cli.securitydata.arguments.search import SearchArguments
1921
from code42cli.securitydata.cursor_store import AEDCursorStore
2022
from code42cli.securitydata.logger_factory import get_error_logger
21-
from code42cli.securitydata.arguments.search import SearchArguments
22-
from code42cli.securitydata.arguments.main import IS_INCREMENTAL_KEY
23-
23+
from code42cli.securitydata.options import ExposureType as ExposureTypeOptions
24+
from code42cli.util import print_error, print_bold, is_interactive
2425

2526
_EXCEPTIONS_OCCURRED = False
2627

src/code42cli/securitydata/logger_factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import sys
21
import logging
2+
import sys
3+
from logging.handlers import RotatingFileHandler
34
from threading import Lock
45

5-
from logging.handlers import RotatingFileHandler
66
from c42eventextractor.logging.formatters import (
77
FileEventDictToJSONFormatter,
88
FileEventDictToCEFFormatter,

src/code42cli/securitydata/subcommands/print_out.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from code42cli.securitydata.logger_factory import get_logger_for_stdout
2-
from code42cli.securitydata.arguments import search as search_args
31
from code42cli.securitydata.arguments import main as main_args
2+
from code42cli.securitydata.arguments import search as search_args
43
from code42cli.securitydata.extraction import extract
4+
from code42cli.securitydata.logger_factory import get_logger_for_stdout
55

66

77
def init(subcommand_parser):

src/code42cli/securitydata/subcommands/send_to.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from code42cli.securitydata.logger_factory import get_logger_for_server
21
from code42cli.securitydata.arguments import main as main_args
32
from code42cli.securitydata.arguments import search as search_args
43
from code42cli.securitydata.extraction import extract
4+
from code42cli.securitydata.logger_factory import get_logger_for_server
55
from code42cli.securitydata.options import ServerProtocol
66

77

0 commit comments

Comments
 (0)