summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-04 16:06:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 07:26:42 +0100
commit296db7e33bd71585cac63dc78c2c95bc619b4a86 (patch)
tree5641a707aa3172f78274bf92ae0d098d6211691b /scripts
parente62fe5a41bdcdd72b9b257fecff7ccdc59c76d33 (diff)
downloadopenembedded-core-296db7e33bd71585cac63dc78c2c95bc619b4a86.tar.gz
openembedded-core-296db7e33bd71585cac63dc78c2c95bc619b4a86.tar.bz2
openembedded-core-296db7e33bd71585cac63dc78c2c95bc619b4a86.zip
wic: don't use L suffix for integers
This suffix is not supported by Python 3. Wic code works without it on Python 2 too, so it's safe to remove it. [YOCTO #9412] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/ksparser.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 27bc1c7ee4..6887a7d024 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -51,7 +51,7 @@ def sizetype(arg):
Converts size string in <num>[K|k|M|G] format into the integer value
"""
if arg.isdigit():
- return int(arg) * 1024L
+ return int(arg) * 1024
if not arg[:-1].isdigit():
raise ArgumentTypeError("Invalid size: %r" % arg)
@@ -60,9 +60,9 @@ def sizetype(arg):
if arg.endswith("k") or arg.endswith("K"):
return size
if arg.endswith("M"):
- return size * 1024L
+ return size * 1024
if arg.endswith("G"):
- return size * 1024L * 1024L
+ return size * 1024 * 1024
raise ArgumentTypeError("Invalid size: %r" % arg)
@@ -127,7 +127,7 @@ class KickStart():
part.add_argument('mountpoint')
part.add_argument('--active', action='store_true')
part.add_argument('--align', type=int)
- part.add_argument("--extra-space", type=sizetype, default=10*1024L)
+ part.add_argument("--extra-space", type=sizetype, default=10*1024)
part.add_argument('--fsoptions', dest='fsopts')
part.add_argument('--fstype')
part.add_argument('--label')