[gnome-continuous-yocto/gnomeostree-3.28-rocko: 290/8267] wic: don't use L suffix for integers



commit b6b5b5e29531be4eb77f1756b78a7b9a5292bcb4
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed May 4 16:06:22 2016 +0300

    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]
    
    (From OE-Core rev: 296db7e33bd71585cac63dc78c2c95bc619b4a86)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/ksparser.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 27bc1c7..6887a7d 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')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]