diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index 0955974dfd..688a59e6f9 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -10,12 +10,14 @@ ''' from __future__ import print_function -import sys +# MU_CHANGE BEGIN: isort imports import argparse -import re import io -import struct import math +import re +import struct +import sys +# MU_CHANGE END # # Globals for help information @@ -37,17 +39,19 @@ def ValidateUnsignedInteger (Argument): return Value def ValidatePcdName (Argument): - if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*\.[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['', '']: + # MU_CHANGE: make regex string a raw string + if re.split (r'[a-zA-Z\_][a-zA-Z0-9\_]*\.[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['', '']: Message = '{Argument} is not in the form .'.format (Argument = Argument) raise argparse.ArgumentTypeError (Message) return Argument def ValidateGuidName (Argument): - if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['', '']: + # MU_CHANGE: make regex string a raw string + if re.split (r'[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) != ['', '']: Message = '{Argument} is not a valid GUID C name'.format (Argument = Argument) raise argparse.ArgumentTypeError (Message) return Argument - + def XdrPackBuffer (buffer): packed_bytes = io.BytesIO() for unpacked_bytes in buffer: