1. Patchew
  2. EDK2
  3. [edk2-devel][edk2-platforms][PATCH V1 0/8] Whitley ACPI Tables
  4. View patch

[edk2-devel][edk2-platforms][PATCH V1 1/8] MinPlatformPkg/AmlGenOffset: Update for python 3

Oram, Isaac W posted 8 patches 4 years ago
[edk2-devel][edk2-platforms][PATCH V1 1/8] MinPlatformPkg/AmlGenOffset: Update for python 3
Posted by Oram, Isaac W 4 years ago 
Update for library changes.
Remove version.
Changed to not open files as bytes.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
index e13ca06471..4799eee1a9 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
@@ -32,16 +32,16 @@ if __name__ == '__main__':
   #
   # Create command line argument parser object
   #
-  parser = argparse.ArgumentParser(prog=__prog__, version=__version__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
+  parser = argparse.ArgumentParser(prog=__prog__, usage=__usage__, description=__copyright__, conflict_handler='resolve')
   group = parser.add_mutually_exclusive_group(required=True)
   group.add_argument("-e", action="store_true", dest='Encode', help='encode file')
   group.add_argument("-d", action="store_true", dest='Decode', help='decode file')
-  parser.add_argument("-o", "--output", dest='OutputFile', type=str, metavar='filename', help="specify the output filename", required=True)
+  parser.add_argument("-o", "--output", dest='OutputFileName', type=str, metavar='filename', help="specify the output filename", required=True)
   parser.add_argument("-v", "--verbose", dest='Verbose', action="store_true", help="increase output messages")
   parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true", help="reduce output messages")
   parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]', choices=range(0,10), default=0, help="set debug level")
   parser.add_argument("--aml_filter", dest='AmlFilterStr', type=str, help="specify the AML filter.")
-  parser.add_argument(metavar="input_file", dest='InputFile', type=argparse.FileType('rb'), help="specify the input filename")
+  parser.add_argument(metavar="input_file", dest='InputFile', type=argparse.FileType('r'), help="specify the input filename")
 
   #
   # Parse command line arguments
@@ -49,11 +49,11 @@ if __name__ == '__main__':
   args = parser.parse_args()
 
   if args.Encode:
-    print 'Unsupported'
+    print('Unsupported')
 
   if args.Decode:
-    args.OutputFileName = args.OutputFile
-    args.OutputFile = open(args.OutputFileName, 'wb')
+    args.OutputFileName = os.path.normpath(args.OutputFileName)
+    args.OutputFile = open(args.OutputFileName, 'w')
 
     AmlFilter = args.AmlFilterStr
     filter_pattern = '|'.join(AmlFilter.split(' '))
@@ -69,4 +69,3 @@ if __name__ == '__main__':
             if match_obj is not None:
                 args.OutputFile.write(line)
     args.OutputFile.close()
-
-- 
2.27.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86422): https://edk2.groups.io/g/devel/message/86422
Mute This Topic: https://groups.io/mt/88979435/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel][edk2-platforms][PATCH V1 1/8] MinPlatformPkg/AmlGenOffset: Update for python 3
Posted by Nate DeSimone 3 years, 12 months ago 
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: Oram, Isaac W <isaac.w.oram@intel.com>
> Sent: Monday, February 7, 2022 11:03 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>
> Subject: [edk2-devel][edk2-platforms][PATCH V1 1/8]
> MinPlatformPkg/AmlGenOffset: Update for python 3
> 
> Update for library changes.
> Remove version.
> Changed to not open files as bytes.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Eric Dong <eric.dong@intel.com>
> Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
> ---
>  Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py | 13
> ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> index e13ca06471..4799eee1a9 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> @@ -32,16 +32,16 @@ if __name__ == '__main__':
>    #
>    # Create command line argument parser object
>    #
> -  parser = argparse.ArgumentParser(prog=__prog__, version=__version__,
> usage=__usage__, description=__copyright__, conflict_handler='resolve')
> +  parser = argparse.ArgumentParser(prog=__prog__, usage=__usage__,
> + description=__copyright__, conflict_handler='resolve')
>    group = parser.add_mutually_exclusive_group(required=True)
>    group.add_argument("-e", action="store_true", dest='Encode',
> help='encode file')
>    group.add_argument("-d", action="store_true", dest='Decode',
> help='decode file')
> -  parser.add_argument("-o", "--output", dest='OutputFile', type=str,
> metavar='filename', help="specify the output filename", required=True)
> +  parser.add_argument("-o", "--output", dest='OutputFileName',
> + type=str, metavar='filename', help="specify the output filename",
> + required=True)
>    parser.add_argument("-v", "--verbose", dest='Verbose',
> action="store_true", help="increase output messages")
>    parser.add_argument("-q", "--quiet", dest='Quiet', action="store_true",
> help="reduce output messages")
>    parser.add_argument("--debug", dest='Debug', type=int, metavar='[0-9]',
> choices=range(0,10), default=0, help="set debug level")
>    parser.add_argument("--aml_filter", dest='AmlFilterStr', type=str,
> help="specify the AML filter.")
> -  parser.add_argument(metavar="input_file", dest='InputFile',
> type=argparse.FileType('rb'), help="specify the input filename")
> +  parser.add_argument(metavar="input_file", dest='InputFile',
> + type=argparse.FileType('r'), help="specify the input filename")
> 
>    #
>    # Parse command line arguments
> @@ -49,11 +49,11 @@ if __name__ == '__main__':
>    args = parser.parse_args()
> 
>    if args.Encode:
> -    print 'Unsupported'
> +    print('Unsupported')
> 
>    if args.Decode:
> -    args.OutputFileName = args.OutputFile
> -    args.OutputFile = open(args.OutputFileName, 'wb')
> +    args.OutputFileName = os.path.normpath(args.OutputFileName)
> +    args.OutputFile = open(args.OutputFileName, 'w')
> 
>      AmlFilter = args.AmlFilterStr
>      filter_pattern = '|'.join(AmlFilter.split(' ')) @@ -69,4 +69,3 @@ if
> __name__ == '__main__':
>              if match_obj is not None:
>                  args.OutputFile.write(line)
>      args.OutputFile.close()
> -
> --
> 2.27.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86469): https://edk2.groups.io/g/devel/message/86469
Mute This Topic: https://groups.io/mt/88979435/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.