aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-06-29 15:08:34 -0500
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-05-04 23:57:52 +1200
commit6b8cfecf481956d4dbdbd0436d42a48729179029 (patch)
tree53a6886343e5a7df3b3b662a3271b0a9ea9550d5
parent48375d481cd5ae67b543dc6d7884858c3acfc55e (diff)
downloadopenembedded-core-contrib-6b8cfecf481956d4dbdbd0436d42a48729179029.tar.gz
layerindex,rrs: Minor changes to work with python3.
[YOCTO #9746] Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
-rw-r--r--rrs/tools/common.py8
-rwxr-xr-xrrs/tools/rrs_distros.py2
2 files changed, 6 insertions, 4 deletions
diff --git a/rrs/tools/common.py b/rrs/tools/common.py
index 32fce45e70..69a0d0103b 100644
--- a/rrs/tools/common.py
+++ b/rrs/tools/common.py
@@ -5,13 +5,15 @@
#
# Licensed under the MIT license, see COPYING.MIT for details
+import logging
+
def common_setup():
import sys, os
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '../../')))
def get_logger(name, settings):
- import logging
import os
+ from logging.handlers import RotatingFileHandler
logger = logging.getLogger(name)
formatter = logging.Formatter("%(asctime)s: %(levelname)s: %(message)s")
@@ -22,8 +24,8 @@ def get_logger(name, settings):
filename = os.path.join(settings.TOOLS_LOG_DIR, name)
maxBytes = 8388608 # 8MB
- handler = logging.handlers.RotatingFileHandler(filename,
- maxBytes=maxBytes)
+ handler = RotatingFileHandler(filename, maxBytes=maxBytes)
+
handler.setFormatter(formatter)
logger.addHandler(handler)
diff --git a/rrs/tools/rrs_distros.py b/rrs/tools/rrs_distros.py
index 46c1058b9f..e0c2defaf8 100755
--- a/rrs/tools/rrs_distros.py
+++ b/rrs/tools/rrs_distros.py
@@ -122,7 +122,7 @@ if __name__=="__main__":
continue
distro_info = search_package_in_distros(pkglst_dir, recipe, recipe_data)
- for distro, alias in distro_info.iteritems():
+ for distro, alias in distro_info.items():
recipedistro = RecipeDistro()
recipedistro.recipe = recipe
recipedistro.distro = distro