diff --git a/plaso/parsers/text_plugins/android_logcat.py b/plaso/parsers/text_plugins/android_logcat.py index 46d4cb4910..a15253f849 100644 --- a/plaso/parsers/text_plugins/android_logcat.py +++ b/plaso/parsers/text_plugins/android_logcat.py @@ -84,13 +84,13 @@ class AndroidLogcatTextPlugin( ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _MONTH_DAY = ( diff --git a/plaso/parsers/text_plugins/apache_access.py b/plaso/parsers/text_plugins/apache_access.py index f273b38f19..038dad13e9 100644 --- a/plaso/parsers/text_plugins/apache_access.py +++ b/plaso/parsers/text_plugins/apache_access.py @@ -71,13 +71,13 @@ class ApacheAccessLogTextPlugin(interface.TextPlugin): 'nov': 11, 'dec': 12} - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) diff --git a/plaso/parsers/text_plugins/apt_history.py b/plaso/parsers/text_plugins/apt_history.py index 5676d93933..1f2050dfaf 100644 --- a/plaso/parsers/text_plugins/apt_history.py +++ b/plaso/parsers/text_plugins/apt_history.py @@ -49,10 +49,10 @@ class APTHistoryLogTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _DATE_TIME = pyparsing.Group( diff --git a/plaso/parsers/text_plugins/aws_elb_access.py b/plaso/parsers/text_plugins/aws_elb_access.py index 3840ba659e..d5d6188f39 100644 --- a/plaso/parsers/text_plugins/aws_elb_access.py +++ b/plaso/parsers/text_plugins/aws_elb_access.py @@ -177,20 +177,20 @@ class AWSELBTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) - _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).setParseAction( + _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).set_parse_action( lambda tokens: int(tokens[0], 10)) _BLANK = pyparsing.Literal('"-"') | pyparsing.Literal('-') _WORD = pyparsing.Word(pyparsing.printables) | _BLANK - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) _UNSIGNED_INTEGER = _INTEGER | _BLANK @@ -204,7 +204,7 @@ class AWSELBTextPlugin(interface.TextPlugin): pyparsing.pyparsing_common.ipv4_address | pyparsing.pyparsing_common.ipv6_address) - _PORT = pyparsing.Word(pyparsing.nums, max=6).setParseAction( + _PORT = pyparsing.Word(pyparsing.nums, max=6).set_parse_action( lambda tokens: int(tokens[0], 10)) | _BLANK _SOURCE_IP_ADDRESS_AND_PORT = pyparsing.Group( @@ -234,13 +234,13 @@ class AWSELBTextPlugin(interface.TextPlugin): _TWO_DIGITS) _REQUEST = pyparsing.quotedString.setResultsName( - 'request').setParseAction(pyparsing.removeQuotes) + 'request').set_parse_action(pyparsing.removeQuotes) _USER_AGENT = pyparsing.quotedString.setResultsName( - 'user_agent').setParseAction(pyparsing.removeQuotes) + 'user_agent').set_parse_action(pyparsing.removeQuotes) _ALPN_CLIENT_PREFERENCE_LIST = pyparsing.quotedString.setResultsName( - 'alpn_client_preference_list').setParseAction(pyparsing.removeQuotes) + 'alpn_client_preference_list').set_parse_action(pyparsing.removeQuotes) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd()) @@ -264,28 +264,28 @@ class AWSELBTextPlugin(interface.TextPlugin): _WORD.setResultsName('ssl_protocol') + _WORD.setResultsName('destination_group_arn') + pyparsing.quotedString.setResultsName( - 'trace_identifier').setParseAction(pyparsing.removeQuotes) + + 'trace_identifier').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'domain_name').setParseAction(pyparsing.removeQuotes) + + 'domain_name').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'chosen_cert_arn').setParseAction(pyparsing.removeQuotes) + + 'chosen_cert_arn').set_parse_action(pyparsing.removeQuotes) + _SIGNED_INTEGER.setResultsName('matched_rule_priority') + _DATE_TIME_ISOFORMAT_STRING.setResultsName('request_time') + pyparsing.quotedString.setResultsName( - 'actions_executed').setParseAction(pyparsing.removeQuotes) + + 'actions_executed').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'redirect_url').setParseAction(pyparsing.removeQuotes) + + 'redirect_url').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'error_reason').setParseAction(pyparsing.removeQuotes) + + 'error_reason').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'destination_list').setParseAction(pyparsing.removeQuotes) + + 'destination_list').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'destination_status_code_list').setParseAction( + 'destination_status_code_list').set_parse_action( pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'classification').setParseAction(pyparsing.removeQuotes) + + 'classification').set_parse_action(pyparsing.removeQuotes) + pyparsing.quotedString.setResultsName( - 'classification_reason').setParseAction(pyparsing.removeQuotes) + + 'classification_reason').set_parse_action(pyparsing.removeQuotes) + _END_OF_LINE) _NETWORK_LOG_LINE = ( diff --git a/plaso/parsers/text_plugins/confluence_access.py b/plaso/parsers/text_plugins/confluence_access.py index 0c48d0a03a..9d49b25580 100644 --- a/plaso/parsers/text_plugins/confluence_access.py +++ b/plaso/parsers/text_plugins/confluence_access.py @@ -62,13 +62,13 @@ class ConfluenceAccessTextPlugin(interface.TextPlugin): NAME = 'confluence_access' DATA_FORMAT = 'Confluence access log (access.log) file' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) diff --git a/plaso/parsers/text_plugins/dpkg.py b/plaso/parsers/text_plugins/dpkg.py index cc1fd1c9f5..0d55b0bde2 100644 --- a/plaso/parsers/text_plugins/dpkg.py +++ b/plaso/parsers/text_plugins/dpkg.py @@ -58,10 +58,10 @@ class DpkgTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _DATE_TIME = pyparsing.Group( diff --git a/plaso/parsers/text_plugins/gdrive_synclog.py b/plaso/parsers/text_plugins/gdrive_synclog.py index b09147baa0..fd8c7fb0b5 100644 --- a/plaso/parsers/text_plugins/gdrive_synclog.py +++ b/plaso/parsers/text_plugins/gdrive_synclog.py @@ -47,16 +47,16 @@ class GoogleDriveSyncLogTextPlugin(interface.TextPluginWithLineContinuation): ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _FRACTION_OF_SECOND = pyparsing.Word('.,', exact=1).suppress() + _THREE_DIGITS diff --git a/plaso/parsers/text_plugins/google_logging.py b/plaso/parsers/text_plugins/google_logging.py index bd12f76820..e117235e3a 100644 --- a/plaso/parsers/text_plugins/google_logging.py +++ b/plaso/parsers/text_plugins/google_logging.py @@ -62,16 +62,16 @@ class GoogleLogTextPlugin( NAME = 'googlelog' DATA_FORMAT = 'Google-formatted log file' - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) - _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).setParseAction( + _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).set_parse_action( lambda tokens: int(tokens[0], 10)) # Date and time values are formatted as: MMDD hh:mm:ss.###### diff --git a/plaso/parsers/text_plugins/iis.py b/plaso/parsers/text_plugins/iis.py index facd199fc1..b1c2ed6434 100644 --- a/plaso/parsers/text_plugins/iis.py +++ b/plaso/parsers/text_plugins/iis.py @@ -84,20 +84,20 @@ class WinIISTextPlugin(interface.TextPlugin): _HTTP_METHOD = pyparsing.Word(pyparsing.alphanums + '-_') | _BLANK - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) | _BLANK - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _IP_ADDRESS = ( pyparsing.pyparsing_common.ipv4_address | pyparsing.pyparsing_common.ipv6_address | _BLANK) - PORT = pyparsing.Word(pyparsing.nums, max=6).setParseAction( + PORT = pyparsing.Word(pyparsing.nums, max=6).set_parse_action( lambda tokens: int(tokens[0], 10)) | _BLANK # Username can consist of: "domain.username", "domain\username", diff --git a/plaso/parsers/text_plugins/ios_lockdownd.py b/plaso/parsers/text_plugins/ios_lockdownd.py index 8b583bdb66..e24d9cf798 100644 --- a/plaso/parsers/text_plugins/ios_lockdownd.py +++ b/plaso/parsers/text_plugins/ios_lockdownd.py @@ -38,13 +38,13 @@ class IOSLockdowndLogTextPlugin(interface.TextPluginWithLineContinuation): NAME = 'ios_lockdownd' DATA_FORMAT = 'iOS lockdown daemon log' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).setParseAction( + _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).set_parse_action( lambda tokens: int(tokens[0], 10)) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd()) diff --git a/plaso/parsers/text_plugins/ios_logd.py b/plaso/parsers/text_plugins/ios_logd.py index 49b5a6e5e4..e5f381e91d 100644 --- a/plaso/parsers/text_plugins/ios_logd.py +++ b/plaso/parsers/text_plugins/ios_logd.py @@ -37,10 +37,10 @@ class IOSSysdiagnoseLogdTextPlugin(interface.TextPlugin): NAME = 'ios_logd' DATA_FORMAT = 'iOS sysdiagnose logd file' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _TIME_ZONE_OFFSET = ( diff --git a/plaso/parsers/text_plugins/ios_sysdiag_log.py b/plaso/parsers/text_plugins/ios_sysdiag_log.py index 003ed37de3..6218ae4c27 100644 --- a/plaso/parsers/text_plugins/ios_sysdiag_log.py +++ b/plaso/parsers/text_plugins/ios_sysdiag_log.py @@ -55,16 +55,16 @@ class IOSSysdiagLogTextPlugin(interface.TextPluginWithLineContinuation): 'nov': 11, 'dec': 12} - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) diff --git a/plaso/parsers/text_plugins/macos_appfirewall.py b/plaso/parsers/text_plugins/macos_appfirewall.py index 4fa9daf47e..6bd521180c 100644 --- a/plaso/parsers/text_plugins/macos_appfirewall.py +++ b/plaso/parsers/text_plugins/macos_appfirewall.py @@ -47,10 +47,10 @@ class MacOSAppFirewallTextPlugin( ENCODING = 'utf-8' - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) @@ -69,7 +69,7 @@ class MacOSAppFirewallTextPlugin( _REPORTER_CHARACTERS = ''.join( [c for c in pyparsing.printables if c not in [':', '[', '<']]) - _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).setParseAction( + _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).set_parse_action( lambda tokens: int(tokens[0], 10)) _AGENT = pyparsing.Combine( diff --git a/plaso/parsers/text_plugins/macos_securityd.py b/plaso/parsers/text_plugins/macos_securityd.py index 703c9296bf..f8637958bd 100644 --- a/plaso/parsers/text_plugins/macos_securityd.py +++ b/plaso/parsers/text_plugins/macos_securityd.py @@ -55,13 +55,13 @@ class MacOSSecuritydLogTextPlugin( ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) @@ -73,7 +73,7 @@ class MacOSSecuritydLogTextPlugin( _TWO_DIGITS.setResultsName('minutes') + pyparsing.Suppress(':') + _TWO_DIGITS.setResultsName('seconds')) - _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).setParseAction( + _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).set_parse_action( lambda tokens: int(tokens[0], 10)) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd()) diff --git a/plaso/parsers/text_plugins/macos_wifi.py b/plaso/parsers/text_plugins/macos_wifi.py index baec050db8..237bbca102 100644 --- a/plaso/parsers/text_plugins/macos_wifi.py +++ b/plaso/parsers/text_plugins/macos_wifi.py @@ -49,16 +49,16 @@ class MacOSWiFiLogTextPlugin( ENCODING = 'utf-8' - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) diff --git a/plaso/parsers/text_plugins/popcontest.py b/plaso/parsers/text_plugins/popcontest.py index 53ef0e2093..ee299723f7 100644 --- a/plaso/parsers/text_plugins/popcontest.py +++ b/plaso/parsers/text_plugins/popcontest.py @@ -149,7 +149,7 @@ class PopularityContestTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) _UNICODE_PRINTABLES = ''.join( diff --git a/plaso/parsers/text_plugins/postgresql.py b/plaso/parsers/text_plugins/postgresql.py index 331d631f9a..27caf9f193 100644 --- a/plaso/parsers/text_plugins/postgresql.py +++ b/plaso/parsers/text_plugins/postgresql.py @@ -51,16 +51,16 @@ class PostgreSQLTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) # Date and time values are formatted as: YYYY-MM-DD hh:mm:ss.### UTC diff --git a/plaso/parsers/text_plugins/powershell_transcript.py b/plaso/parsers/text_plugins/powershell_transcript.py index aef7299fa6..24348e59fa 100644 --- a/plaso/parsers/text_plugins/powershell_transcript.py +++ b/plaso/parsers/text_plugins/powershell_transcript.py @@ -69,10 +69,10 @@ class PowerShellTranscriptLogTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) # Date and time values are formatted as: YYYYMMDDhhmmss diff --git a/plaso/parsers/text_plugins/santa.py b/plaso/parsers/text_plugins/santa.py index 05bee2c12c..7c79b17953 100644 --- a/plaso/parsers/text_plugins/santa.py +++ b/plaso/parsers/text_plugins/santa.py @@ -181,13 +181,13 @@ class SantaTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _SEPARATOR = pyparsing.Suppress('|') diff --git a/plaso/parsers/text_plugins/sccm.py b/plaso/parsers/text_plugins/sccm.py index 7ae272d380..febf832903 100644 --- a/plaso/parsers/text_plugins/sccm.py +++ b/plaso/parsers/text_plugins/sccm.py @@ -41,17 +41,17 @@ class SCCMTextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) _TWO_OR_THREE_DIGITS = pyparsing.Word( - pyparsing.nums, min=2, max=3).setParseAction( + pyparsing.nums, min=2, max=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) # Date formatted as: date="M-D-YYYY" diff --git a/plaso/parsers/text_plugins/selinux.py b/plaso/parsers/text_plugins/selinux.py index 6780e494c3..ae7cc6559d 100644 --- a/plaso/parsers/text_plugins/selinux.py +++ b/plaso/parsers/text_plugins/selinux.py @@ -53,7 +53,7 @@ class SELinuxTextPlugin(interface.TextPlugin): NAME = 'selinux' DATA_FORMAT = 'SELinux audit log (audit.log) file' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) _KEY_VALUE_GROUP = pyparsing.Group( diff --git a/plaso/parsers/text_plugins/setupapi.py b/plaso/parsers/text_plugins/setupapi.py index 19152c867a..82dbee695b 100644 --- a/plaso/parsers/text_plugins/setupapi.py +++ b/plaso/parsers/text_plugins/setupapi.py @@ -46,13 +46,13 @@ class SetupAPILogTextPlugin(interface.TextPlugin): NAME = 'setupapi' DATA_FORMAT = 'Windows SetupAPI log file' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd()) diff --git a/plaso/parsers/text_plugins/skydrivelog.py b/plaso/parsers/text_plugins/skydrivelog.py index 02625b2c6c..1d62781190 100644 --- a/plaso/parsers/text_plugins/skydrivelog.py +++ b/plaso/parsers/text_plugins/skydrivelog.py @@ -45,16 +45,16 @@ class SkyDriveLog1TextPlugin(interface.TextPlugin): ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) # Format version 1 date and time values are formatted as: @@ -243,13 +243,13 @@ class SkyDriveLog2TextPlugin(interface.TextPluginWithLineContinuation): ENCODING = 'utf-8' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).setParseAction( + _THREE_DIGITS = pyparsing.Word(pyparsing.nums, exact=3).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) # Format version 2 header date and time values are formatted as: diff --git a/plaso/parsers/text_plugins/snort_fastlog.py b/plaso/parsers/text_plugins/snort_fastlog.py index 4bc8593c5e..056a7b8a56 100644 --- a/plaso/parsers/text_plugins/snort_fastlog.py +++ b/plaso/parsers/text_plugins/snort_fastlog.py @@ -70,13 +70,13 @@ class SnortFastLogTextPlugin( NAME = 'snort_fastlog' DATA_FORMAT = 'Snort3/Suricata fast-log alert log (fast.log) file' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).setParseAction( + _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).set_parse_action( lambda tokens: int(tokens[0], 10)) _DATE_MONTH_DAY = ( diff --git a/plaso/parsers/text_plugins/sophos_av.py b/plaso/parsers/text_plugins/sophos_av.py index bf314bb301..44bb1897ac 100644 --- a/plaso/parsers/text_plugins/sophos_av.py +++ b/plaso/parsers/text_plugins/sophos_av.py @@ -37,10 +37,10 @@ class SophosAVLogTextPlugin(interface.TextPlugin): ENCODING = 'utf-16-le' - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) # Date and time values are formatted as: YYYYMMDD hhmmss diff --git a/plaso/parsers/text_plugins/syslog.py b/plaso/parsers/text_plugins/syslog.py index 45a927270d..3fe8987cae 100644 --- a/plaso/parsers/text_plugins/syslog.py +++ b/plaso/parsers/text_plugins/syslog.py @@ -318,16 +318,16 @@ class SyslogTextPlugin(BaseSyslogTextPlugin): r'($|\n<\d{1,3}>1\s\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}[\+|-]\d{2}' r':\d{2}\s))') - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) - _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).setParseAction( + _SIX_DIGITS = pyparsing.Word(pyparsing.nums, exact=6).set_parse_action( lambda tokens: int(tokens[0], 10)) _DATE_TIME_RFC3339 = ( @@ -341,7 +341,7 @@ class SyslogTextPlugin(BaseSyslogTextPlugin): _TWO_DIGITS + pyparsing.Optional( pyparsing.Suppress(':') + _TWO_DIGITS)) - _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).setParseAction( + _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).set_parse_action( lambda tokens: int(tokens[0], 10)) _REPORTER = pyparsing.Word(_REPORTER_CHARACTERS) @@ -578,10 +578,10 @@ class TraditionalSyslogTextPlugin( r'($|\n<\d{1,3}>1\s\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}[\+|-]\d{2}' r':\d{2}\s))') - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) @@ -594,7 +594,7 @@ class TraditionalSyslogTextPlugin( pyparsing.Suppress('.') + pyparsing.Word(pyparsing.nums))) - _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).setParseAction( + _PROCESS_IDENTIFIER = pyparsing.Word(pyparsing.nums, max=5).set_parse_action( lambda tokens: int(tokens[0], 10)) _REPORTER = pyparsing.Word(_REPORTER_CHARACTERS) diff --git a/plaso/parsers/text_plugins/viminfo.py b/plaso/parsers/text_plugins/viminfo.py index fcb39ebf0d..ac4e7d7d0c 100644 --- a/plaso/parsers/text_plugins/viminfo.py +++ b/plaso/parsers/text_plugins/viminfo.py @@ -45,7 +45,7 @@ class VimInfoTextPlugin(interface.TextPlugin,): _FILENAME = '.viminfo' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd()) diff --git a/plaso/parsers/text_plugins/vsftpd.py b/plaso/parsers/text_plugins/vsftpd.py index 7a1ee45caa..4cd01d69f5 100644 --- a/plaso/parsers/text_plugins/vsftpd.py +++ b/plaso/parsers/text_plugins/vsftpd.py @@ -49,13 +49,13 @@ class VsftpdLogTextPlugin(interface.TextPlugin): 'nov': 11, 'dec': 12} - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) diff --git a/plaso/parsers/text_plugins/winfirewall.py b/plaso/parsers/text_plugins/winfirewall.py index b4b3b06b88..43f04bac6e 100644 --- a/plaso/parsers/text_plugins/winfirewall.py +++ b/plaso/parsers/text_plugins/winfirewall.py @@ -67,10 +67,10 @@ class WinFirewallLogTextPlugin(interface.TextPlugin): # A Windows Firewall is encoded using the system codepage. ENCODING = None - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _DATE = pyparsing.Group( @@ -91,11 +91,11 @@ class WinFirewallLogTextPlugin(interface.TextPlugin): pyparsing.pyparsing_common.ipv6_address | pyparsing.Suppress('-')) _PORT_NUMBER_OR_BLANK = ( - pyparsing.Word(pyparsing.nums, max=6).setParseAction( + pyparsing.Word(pyparsing.nums, max=6).set_parse_action( lambda tokens: int(tokens[0], 10)) | pyparsing.Suppress('-')) _INTEGER_OR_BLANK = ( - pyparsing.Word(pyparsing.nums).setParseAction( + pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) | pyparsing.Suppress('-')) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd()) diff --git a/plaso/parsers/text_plugins/xchatlog.py b/plaso/parsers/text_plugins/xchatlog.py index 7547f908f9..95a02eee98 100644 --- a/plaso/parsers/text_plugins/xchatlog.py +++ b/plaso/parsers/text_plugins/xchatlog.py @@ -91,13 +91,13 @@ class XChatLogTextPlugin( ENCODING = 'utf-8' - _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).setParseAction( + _ONE_OR_TWO_DIGITS = pyparsing.Word(pyparsing.nums, max=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).setParseAction( + _TWO_DIGITS = pyparsing.Word(pyparsing.nums, exact=2).set_parse_action( lambda tokens: int(tokens[0], 10)) - _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).setParseAction( + _FOUR_DIGITS = pyparsing.Word(pyparsing.nums, exact=4).set_parse_action( lambda tokens: int(tokens[0], 10)) _THREE_LETTERS = pyparsing.Word(pyparsing.alphas, exact=3) diff --git a/plaso/parsers/text_plugins/zsh_extended_history.py b/plaso/parsers/text_plugins/zsh_extended_history.py index e37770f424..ffb7047411 100644 --- a/plaso/parsers/text_plugins/zsh_extended_history.py +++ b/plaso/parsers/text_plugins/zsh_extended_history.py @@ -43,7 +43,7 @@ class ZshExtendedHistoryTextPlugin(interface.TextPluginWithLineContinuation): ENCODING = 'utf-8' - _INTEGER = pyparsing.Word(pyparsing.nums).setParseAction( + _INTEGER = pyparsing.Word(pyparsing.nums).set_parse_action( lambda tokens: int(tokens[0], 10)) _END_OF_LINE = pyparsing.Suppress(pyparsing.LineEnd())