Changes to Confluence access log parser for pyparsing 2.4 #4137 (#4138)

log2timeline · Jun 11, 2022 · daa4487 · daa4487
1 parent 52c1bb1
commit daa4487
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plaso/parsers/confluence_access.py b/plaso/parsers/confluence_access.py
@@ -97,15 +97,15 @@ class ConfluenceAccessParser(text_parser.PyparsingSingleLineTextParser):
       pyparsing.Word(pyparsing.alphanums + '-').setResultsName('thread_name')
   )
 
-  _USER_AGENT = pyparsing.rest_of_line.setResultsName('user_agent')
+  _USER_AGENT = pyparsing.restOfLine.setResultsName('user_agent')
 
   _USER_NAME = (
       pyparsing.Word(pyparsing.alphanums + '@' + pyparsing.alphanums + '.') |
       pyparsing.Word(pyparsing.alphanums) |
       pyparsing.Literal('-')).setResultsName('user_name')
 
   _HTTP_METHOD = (
-      pyparsing.one_of(
+      pyparsing.oneOf(
           ['CONNECT', 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST',
               'PUT', 'TRACE'])).setResultsName('http_method')