Restoring authorship annotation for <snowball@yandex-team.ru>. Commit 1 of 2.

build/external_resources/codenavigation/ya.make

@@ -1,4 +1,4 @@
-OWNER(g:yatool)
+OWNER(g:yatool) 
 
 RESOURCES_LIBRARY()
 

build/plugins/_common.py

@@ -185,9 +185,9 @@ def filter_out_by_keyword(test_data, keyword):
     return list(_iterate())
 
 
-def generate_chunks(lst, chunk_size):
-    for i in xrange(0, len(lst), chunk_size):
-        yield lst[i:(i + chunk_size)]
+def generate_chunks(lst, chunk_size): 
+    for i in xrange(0, len(lst), chunk_size): 
+        yield lst[i:(i + chunk_size)] 
 
 
 def strip_roots(path):

build/plugins/_requirements.py

@@ -1,49 +1,49 @@
-import _test_const as consts
-
-
-def check_cpu(suite_cpu_requirements, test_size, is_kvm=False):
-    min_cpu_requirements = consts.TestRequirementsConstants.MinCpu
-    max_cpu_requirements = consts.TestSize.get_max_requirements(test_size).get(consts.TestRequirements.Cpu)
-    if isinstance(suite_cpu_requirements, str):
-        if all(consts.TestRequirementsConstants.is_all_cpu(req) for req in (max_cpu_requirements, suite_cpu_requirements)):
+import _test_const as consts 
+ 
+ 
+def check_cpu(suite_cpu_requirements, test_size, is_kvm=False): 
+    min_cpu_requirements = consts.TestRequirementsConstants.MinCpu 
+    max_cpu_requirements = consts.TestSize.get_max_requirements(test_size).get(consts.TestRequirements.Cpu) 
+    if isinstance(suite_cpu_requirements, str): 
+        if all(consts.TestRequirementsConstants.is_all_cpu(req) for req in (max_cpu_requirements, suite_cpu_requirements)): 
             return None
         return "Wrong 'cpu' requirements: {}, should be in [{}..{}] for {}-size tests".format(suite_cpu_requirements, min_cpu_requirements, max_cpu_requirements, test_size)
-
-    if not isinstance(suite_cpu_requirements, int):
+ 
+    if not isinstance(suite_cpu_requirements, int): 
         return "Wrong 'cpu' requirements: {}, should be integer".format(suite_cpu_requirements)
-
-    if suite_cpu_requirements < min_cpu_requirements or suite_cpu_requirements > consts.TestRequirementsConstants.get_cpu_value(max_cpu_requirements):
+ 
+    if suite_cpu_requirements < min_cpu_requirements or suite_cpu_requirements > consts.TestRequirementsConstants.get_cpu_value(max_cpu_requirements): 
         return "Wrong 'cpu' requirement: {}, should be in [{}..{}] for {}-size tests".format(suite_cpu_requirements, min_cpu_requirements, max_cpu_requirements, test_size)
-
+ 
     return None
-
-
-# TODO: Remove is_kvm param when there will be guarantees on RAM
-def check_ram(suite_ram_requirements, test_size, is_kvm=False):
-    if not isinstance(suite_ram_requirements, int):
+ 
+ 
+# TODO: Remove is_kvm param when there will be guarantees on RAM 
+def check_ram(suite_ram_requirements, test_size, is_kvm=False): 
+    if not isinstance(suite_ram_requirements, int): 
         return "Wrong 'ram' requirements: {}, should be integer".format(suite_ram_requirements)
-    min_ram_requirements = consts.TestRequirementsConstants.MinRam
-    max_ram_requirements = consts.MAX_RAM_REQUIREMENTS_FOR_KVM if is_kvm else consts.TestSize.get_max_requirements(test_size).get(consts.TestRequirements.Ram)
-    if suite_ram_requirements < min_ram_requirements or suite_ram_requirements > max_ram_requirements:
-        err_msg = "Wrong 'ram' requirements: {}, should be in [{}..{}] for {}-size tests".format(suite_ram_requirements, min_ram_requirements, max_ram_requirements, test_size)
-        if is_kvm:
-            err_msg += ' with kvm requirements'
-        return err_msg
+    min_ram_requirements = consts.TestRequirementsConstants.MinRam 
+    max_ram_requirements = consts.MAX_RAM_REQUIREMENTS_FOR_KVM if is_kvm else consts.TestSize.get_max_requirements(test_size).get(consts.TestRequirements.Ram) 
+    if suite_ram_requirements < min_ram_requirements or suite_ram_requirements > max_ram_requirements: 
+        err_msg = "Wrong 'ram' requirements: {}, should be in [{}..{}] for {}-size tests".format(suite_ram_requirements, min_ram_requirements, max_ram_requirements, test_size) 
+        if is_kvm: 
+            err_msg += ' with kvm requirements' 
+        return err_msg 
     return None
-
-
-def check_ram_disk(suite_ram_disk, test_size, is_kvm=False):
-    min_ram_disk = consts.TestRequirementsConstants.MinRamDisk
-    max_ram_disk = consts.TestSize.get_max_requirements(test_size).get(consts.TestRequirements.RamDisk)
-    if isinstance(suite_ram_disk, str):
-        if all(consts.TestRequirementsConstants.is_all_ram_disk(req) for req in (max_ram_disk, suite_ram_disk)):
+ 
+ 
+def check_ram_disk(suite_ram_disk, test_size, is_kvm=False): 
+    min_ram_disk = consts.TestRequirementsConstants.MinRamDisk 
+    max_ram_disk = consts.TestSize.get_max_requirements(test_size).get(consts.TestRequirements.RamDisk) 
+    if isinstance(suite_ram_disk, str): 
+        if all(consts.TestRequirementsConstants.is_all_ram_disk(req) for req in (max_ram_disk, suite_ram_disk)): 
             return None
         return "Wrong 'ram_disk' requirements: {}, should be in [{}..{}] for {}-size tests".format(suite_ram_disk, 0, max_ram_disk, test_size)
-
-    if not isinstance(suite_ram_disk, int):
+ 
+    if not isinstance(suite_ram_disk, int): 
         return "Wrong 'ram_disk' requirements: {}, should be integer".format(suite_ram_disk)
-
-    if suite_ram_disk < min_ram_disk or suite_ram_disk > consts.TestRequirementsConstants.get_ram_disk_value(max_ram_disk):
+ 
+    if suite_ram_disk < min_ram_disk or suite_ram_disk > consts.TestRequirementsConstants.get_ram_disk_value(max_ram_disk): 
         return "Wrong 'ram_disk' requirement: {}, should be in [{}..{}] for {}-size tests".format(suite_ram_disk, min_ram_disk, max_ram_disk, test_size)
-
+ 
     return None

build/plugins/_test_const.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-import re
+import re 
 import sys
 
 
@@ -24,25 +24,25 @@ REPORT_SNIPPET_LIMIT = 10000
 SANITIZER_ERROR_RC = 100
 TEST_SUBTEST_SEPARATOR = '::'
 TESTING_OUT_DIR_NAME = "testing_out_stuff"
-TESTING_OUT_TAR_NAME = TESTING_OUT_DIR_NAME + ".tar"
+TESTING_OUT_TAR_NAME = TESTING_OUT_DIR_NAME + ".tar" 
 TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
 TRACE_FILE_NAME = "ytest.report.trace"
 TRUNCATING_IGNORE_FILE_LIST = {TRACE_FILE_NAME, "run_test.log"}
 
-# kvm
-DEFAULT_RAM_REQUIREMENTS_FOR_KVM = 4
-MAX_RAM_REQUIREMENTS_FOR_KVM = 16
-
-# distbuild
-TEST_NODE_FINISHING_TIME = 5 * 60
-DEFAULT_TEST_NODE_TIMEOUT = 15 * 60
-
+# kvm 
+DEFAULT_RAM_REQUIREMENTS_FOR_KVM = 4 
+MAX_RAM_REQUIREMENTS_FOR_KVM = 16 
+ 
+# distbuild 
+TEST_NODE_FINISHING_TIME = 5 * 60 
+DEFAULT_TEST_NODE_TIMEOUT = 15 * 60 
+ 
 # coverage
-COVERAGE_TESTS_TIMEOUT_FACTOR = 1.5
-COVERAGE_RESOLVED_FILE_NAME_PATTERN = "coverage_resolved.{}.json"
-CPP_COVERAGE_RESOLVED_FILE_NAME = COVERAGE_RESOLVED_FILE_NAME_PATTERN.format("cpp")
-JAVA_COVERAGE_RESOLVED_FILE_NAME = COVERAGE_RESOLVED_FILE_NAME_PATTERN.format("java")
-PYTHON_COVERAGE_RESOLVED_FILE_NAME = COVERAGE_RESOLVED_FILE_NAME_PATTERN.format("python")
+COVERAGE_TESTS_TIMEOUT_FACTOR = 1.5 
+COVERAGE_RESOLVED_FILE_NAME_PATTERN = "coverage_resolved.{}.json" 
+CPP_COVERAGE_RESOLVED_FILE_NAME = COVERAGE_RESOLVED_FILE_NAME_PATTERN.format("cpp") 
+JAVA_COVERAGE_RESOLVED_FILE_NAME = COVERAGE_RESOLVED_FILE_NAME_PATTERN.format("java") 
+PYTHON_COVERAGE_RESOLVED_FILE_NAME = COVERAGE_RESOLVED_FILE_NAME_PATTERN.format("python") 
 CLANG_COVERAGE_TEST_TYPES = ("unittest", "coverage_extractor", "pytest", "py3test", "gtest", "boost_test", "exectest")
 COVERAGE_TABLE_CHUNKS = 20
 COVERAGE_YT_PROXY = "hahn.yt.yandex.net"
@@ -55,26 +55,26 @@ CORPUS_DATA_ROOT_DIR = 'fuzzing'
 CORPUS_DIR_NAME = 'corpus'
 FUZZING_COMPRESSION_COEF = 1.1
 FUZZING_DEFAULT_TIMEOUT = 3600
-FUZZING_FINISHING_TIME = 600
+FUZZING_FINISHING_TIME = 600 
 FUZZING_TIMEOUT_RE = re.compile(r'(^|\s)-max_total_time=(?P<max_time>\d+)')
 GENERATED_CORPUS_DIR_NAME = 'mined_corpus'
 MAX_CORPUS_RESOURCES_ALLOWED = 5
 
-TEST_TOOL_HOST = 'TEST_TOOL_HOST_RESOURCE_GLOBAL'
-TEST_TOOL_TARGET = 'TEST_TOOL_TARGET_RESOURCE_GLOBAL'
-TEST_TOOL_HOST_LOCAL = 'TEST_TOOL_HOST_LOCAL'
-TEST_TOOL_TARGET_LOCAL = 'TEST_TOOL_TARGET_LOCAL'
-XCODE_TOOLS_RESOURCE = 'XCODE_TOOLS_ROOT_RESOURCE_GLOBAL'
-GO_TOOLS_RESOURCE = 'GO_TOOLS_RESOURCE_GLOBAL'
-LLVM_COV9_RESOURCE = 'LLVM_COV9_RESOURCE_GLOBAL'
-PEP8_PY2_RESOURCE = 'PEP8_PY2_RESOURCE_GLOBAL'
-PEP8_PY3_RESOURCE = 'PEP8_PY3_RESOURCE_GLOBAL'
-FLAKES_PY2_RESOURCE = 'FLAKES_PY2_RESOURCE_GLOBAL'
-FLAKES_PY3_RESOURCE = 'FLAKES_PY3_RESOURCE_GLOBAL'
+TEST_TOOL_HOST = 'TEST_TOOL_HOST_RESOURCE_GLOBAL' 
+TEST_TOOL_TARGET = 'TEST_TOOL_TARGET_RESOURCE_GLOBAL' 
+TEST_TOOL_HOST_LOCAL = 'TEST_TOOL_HOST_LOCAL' 
+TEST_TOOL_TARGET_LOCAL = 'TEST_TOOL_TARGET_LOCAL' 
+XCODE_TOOLS_RESOURCE = 'XCODE_TOOLS_ROOT_RESOURCE_GLOBAL' 
+GO_TOOLS_RESOURCE = 'GO_TOOLS_RESOURCE_GLOBAL' 
+LLVM_COV9_RESOURCE = 'LLVM_COV9_RESOURCE_GLOBAL' 
+PEP8_PY2_RESOURCE = 'PEP8_PY2_RESOURCE_GLOBAL' 
+PEP8_PY3_RESOURCE = 'PEP8_PY3_RESOURCE_GLOBAL' 
+FLAKES_PY2_RESOURCE = 'FLAKES_PY2_RESOURCE_GLOBAL' 
+FLAKES_PY3_RESOURCE = 'FLAKES_PY3_RESOURCE_GLOBAL' 
 FLAKE8_PY2_RESOURCE = 'FLAKE8_PY2_RESOURCE_GLOBAL'
 FLAKE8_PY3_RESOURCE = 'FLAKE8_PY3_RESOURCE_GLOBAL'
 
-
+ 
 class Enum(object):
 
     @classmethod
@@ -82,134 +82,134 @@ class Enum(object):
         return [v for k, v in cls.__dict__.items() if not k.startswith("_")]
 
 
-class TestRequirements(Enum):
-    Container = 'container'
-    Cpu = 'cpu'
-    DiskUsage = 'disk_usage'
-    Ram = 'ram'
-    RamDisk = 'ram_disk'
-    SbVault = 'sb_vault'
-    Network = 'network'
-    Dns = 'dns'
-    Kvm = 'kvm'
-
-
-class TestRequirementsConstants(Enum):
-    All = 'all'
-    AllCpuValue = 50
-    AllRamDiskValue = 50
-    MinCpu = 1
-    MinRam = 1
-    MinRamDisk = 0
-
-    @classmethod
-    def is_all_cpu(cls, value):
-        return value == cls.All
-
-    @classmethod
-    def get_cpu_value(cls, value):
-        return cls.AllCpuValue if cls.is_all_cpu(value) else value
-
-    @classmethod
-    def is_all_ram_disk(cls, value):
-        return value == cls.All
-
-    @classmethod
-    def get_ram_disk_value(cls, value):
-        return cls.AllRamDiskValue if cls.is_all_ram_disk(value) else value
-
-
+class TestRequirements(Enum): 
+    Container = 'container' 
+    Cpu = 'cpu' 
+    DiskUsage = 'disk_usage' 
+    Ram = 'ram' 
+    RamDisk = 'ram_disk' 
+    SbVault = 'sb_vault' 
+    Network = 'network' 
+    Dns = 'dns' 
+    Kvm = 'kvm' 
+ 
+ 
+class TestRequirementsConstants(Enum): 
+    All = 'all' 
+    AllCpuValue = 50 
+    AllRamDiskValue = 50 
+    MinCpu = 1 
+    MinRam = 1 
+    MinRamDisk = 0 
+ 
+    @classmethod 
+    def is_all_cpu(cls, value): 
+        return value == cls.All 
+ 
+    @classmethod 
+    def get_cpu_value(cls, value): 
+        return cls.AllCpuValue if cls.is_all_cpu(value) else value 
+ 
+    @classmethod 
+    def is_all_ram_disk(cls, value): 
+        return value == cls.All 
+ 
+    @classmethod 
+    def get_ram_disk_value(cls, value): 
+        return cls.AllRamDiskValue if cls.is_all_ram_disk(value) else value 
+ 
+ 
 class TestSize(Enum):
     Small = 'small'
     Medium = 'medium'
     Large = 'large'
 
-    DefaultTimeouts = {
+    DefaultTimeouts = { 
         Small: 60,
         Medium: 600,
         Large: 3600,
     }
 
-    DefaultPriorities = {
-        Small: -1,
-        Medium: -2,
-        Large: -3,
-    }
-
-    DefaultRequirements = {
-        Small: {
-            TestRequirements.Cpu: 1,
-            TestRequirements.Ram: 32,
-            # TestRequirements.Ram: 2,
-            TestRequirements.RamDisk: 0,
-        },
-        Medium: {
-            TestRequirements.Cpu: 1,
-            TestRequirements.Ram: 32,
-            # TestRequirements.Ram: 4,
-            TestRequirements.RamDisk: 0,
-        },
-        Large: {
-            TestRequirements.Cpu: 1,
-            TestRequirements.Ram: 32,
-            # TestRequirements.Ram: 8,
-            TestRequirements.RamDisk: 0,
-        },
-    }
-
-    MaxRequirements = {
-        Small: {
-            TestRequirements.Cpu: 4,
-            TestRequirements.Ram: 32,
-            # TestRequirements.Ram: 4,
-            TestRequirements.RamDisk: 4,
-        },
-        Medium: {
-            TestRequirements.Cpu: 4,
-            # TestRequirements.Cpu: 8,
-            TestRequirements.Ram: 32,
-            # TestRequirements.Ram: 16,
-            TestRequirements.RamDisk: 4,
-        },
-        Large: {
+    DefaultPriorities = { 
+        Small: -1, 
+        Medium: -2, 
+        Large: -3, 
+    } 
+ 
+    DefaultRequirements = { 
+        Small: { 
+            TestRequirements.Cpu: 1, 
+            TestRequirements.Ram: 32, 
+            # TestRequirements.Ram: 2, 
+            TestRequirements.RamDisk: 0, 
+        }, 
+        Medium: { 
+            TestRequirements.Cpu: 1, 
+            TestRequirements.Ram: 32, 
+            # TestRequirements.Ram: 4, 
+            TestRequirements.RamDisk: 0, 
+        }, 
+        Large: { 
+            TestRequirements.Cpu: 1, 
+            TestRequirements.Ram: 32, 
+            # TestRequirements.Ram: 8, 
+            TestRequirements.RamDisk: 0, 
+        }, 
+    } 
+ 
+    MaxRequirements = { 
+        Small: { 
+            TestRequirements.Cpu: 4, 
+            TestRequirements.Ram: 32, 
+            # TestRequirements.Ram: 4, 
+            TestRequirements.RamDisk: 4, 
+        }, 
+        Medium: { 
+            TestRequirements.Cpu: 4, 
+            # TestRequirements.Cpu: 8, 
+            TestRequirements.Ram: 32, 
+            # TestRequirements.Ram: 16, 
+            TestRequirements.RamDisk: 4, 
+        }, 
+        Large: { 
             TestRequirements.Cpu: 4,
-            TestRequirements.Ram: 32,
-            TestRequirements.RamDisk: 4,
-        },
-    }
-
+            TestRequirements.Ram: 32, 
+            TestRequirements.RamDisk: 4, 
+        }, 
+    } 
+ 
     @classmethod
     def sizes(cls):
-        return cls.DefaultTimeouts.keys()
+        return cls.DefaultTimeouts.keys() 
 
     @classmethod
     def get_default_timeout(cls, size):
-        if size in cls.DefaultTimeouts:
-            return cls.DefaultTimeouts[size]
-        raise Exception("Unknown test size '{}'".format(size))
-
-    @classmethod
-    def get_default_priorities(cls, size):
-        if size in cls.DefaultPriorities:
-            return cls.DefaultPriorities[size]
-        raise Exception("Unknown test size '{}'".format(size))
-
-    @classmethod
-    def get_default_requirements(cls, size):
-        if size in cls.DefaultRequirements:
-            return cls.DefaultRequirements[size]
+        if size in cls.DefaultTimeouts: 
+            return cls.DefaultTimeouts[size] 
         raise Exception("Unknown test size '{}'".format(size))
 
-    @classmethod
-    def get_max_requirements(cls, size):
-        if size in cls.MaxRequirements:
-            return cls.MaxRequirements[size]
-        raise Exception("Unknown test size '{}'".format(size))
-
-
+    @classmethod 
+    def get_default_priorities(cls, size): 
+        if size in cls.DefaultPriorities: 
+            return cls.DefaultPriorities[size] 
+        raise Exception("Unknown test size '{}'".format(size)) 
+
+    @classmethod 
+    def get_default_requirements(cls, size): 
+        if size in cls.DefaultRequirements: 
+            return cls.DefaultRequirements[size] 
+        raise Exception("Unknown test size '{}'".format(size)) 
+ 
+    @classmethod 
+    def get_max_requirements(cls, size): 
+        if size in cls.MaxRequirements: 
+            return cls.MaxRequirements[size] 
+        raise Exception("Unknown test size '{}'".format(size)) 
+ 
+ 
 class TestRunExitCode(Enum):
     Skipped = 2
-    Failed = 3
+    Failed = 3 
     TimeOut = 10
     InfrastructureError = 12
 
@@ -223,8 +223,8 @@ class YaTestTags(Enum):
     Fat = "ya:fat"
     RunWithAsserts = "ya:relwithdebinfo"
     Privileged = "ya:privileged"
-    ExoticPlatform = "ya:exotic_platform"
-    NotAutocheck = "ya:not_autocheck"
+    ExoticPlatform = "ya:exotic_platform" 
+    NotAutocheck = "ya:not_autocheck" 
 
 
 class Status(object):
@@ -256,7 +256,7 @@ class _Colors(object):
         "white",
         "yellow",
     ]
-    _PREFIXES = ["", "light", "dark"]
+    _PREFIXES = ["", "light", "dark"] 
 
     def __init__(self):
         self._table = {}

build/plugins/_xsyn_includes.py

@@ -48,7 +48,7 @@ def process_xsyn(filepath, on_element):
 
     # keep a stack of filepathes if on_element calls process_xsyn recursively
     with open(filepath) as xsyn_file:
-        from xml.dom.minidom import parse
+        from xml.dom.minidom import parse 
         tree = parse(xsyn_file)
         tree.normalize()
         res = traverse_xsyn(tree, on_element)

build/plugins/build_mn_files.py

@@ -1,6 +1,6 @@
 from os.path import basename, splitext
 
-
+ 
 def on_build_mns_files(unit, *args):
     files = []
     name = ''

build/plugins/cp.py

@@ -4,12 +4,12 @@ from _common import sort_by_keywords
 
 
 def oncopy(unit, *args):
-    keywords = {'RESULT': 1, 'KEEP_DIR_STRUCT': 0, 'DESTINATION': 1, 'FROM': 1}
+    keywords = {'RESULT': 1, 'KEEP_DIR_STRUCT': 0, 'DESTINATION': 1, 'FROM': 1} 
 
     flat_args, spec_args = sort_by_keywords(keywords, args)
 
     dest_dir = spec_args['DESTINATION'][0] if 'DESTINATION' in spec_args else ''
-    from_dir = spec_args['FROM'][0] if 'FROM' in spec_args else ''
+    from_dir = spec_args['FROM'][0] if 'FROM' in spec_args else '' 
     keep_struct = 'KEEP_DIR_STRUCT' in spec_args
     save_in_var = 'RESULT' in spec_args
     targets = []
@@ -21,10 +21,10 @@ def oncopy(unit, *args):
         if keep_struct:
             if path_list[:-1]:
                 rel_path = os.path.join(*path_list[:-1])
-        source_path = os.path.join(from_dir, rel_path, filename)
-        target_path = os.path.join(dest_dir, rel_path, filename)
+        source_path = os.path.join(from_dir, rel_path, filename) 
+        target_path = os.path.join(dest_dir, rel_path, filename) 
         if save_in_var:
-            targets.append(target_path)
-        unit.oncopy_file([source_path, target_path])
+            targets.append(target_path) 
+        unit.oncopy_file([source_path, target_path]) 
     if save_in_var:
         unit.set([spec_args["RESULT"][0], " ".join(targets)])

build/plugins/create_init_py.py

@@ -3,13 +3,13 @@ import os
 from _common import sort_by_keywords
 
 
-def oncreate_init_py_structure(unit, *args):
+def oncreate_init_py_structure(unit, *args): 
     if unit.get('DISTBUILD'):
         return
-    target_dir = unit.get('PY_PROTOS_FOR_DIR')
-    path_list = target_dir.split(os.path.sep)[1:]
-    inits = [os.path.join("${ARCADIA_BUILD_ROOT}", '__init__.py')]
-    for i in range(1, len(path_list) + 1):
-        inits.append(os.path.join("${ARCADIA_BUILD_ROOT}", os.path.join(*path_list[0:i]), '__init__.py'))
-    unit.ontouch(inits)
+    target_dir = unit.get('PY_PROTOS_FOR_DIR') 
+    path_list = target_dir.split(os.path.sep)[1:] 
+    inits = [os.path.join("${ARCADIA_BUILD_ROOT}", '__init__.py')] 
+    for i in range(1, len(path_list) + 1): 
+        inits.append(os.path.join("${ARCADIA_BUILD_ROOT}", os.path.join(*path_list[0:i]), '__init__.py')) 
+    unit.ontouch(inits) 
 

build/plugins/lib/_metric_resolvers.py

@@ -1,11 +1,11 @@
-import re
-
-VALUE_PATTERN = re.compile(r"^\s*(?P<value>\d+)\s*$")
-
-
-def resolve_value(val):
-    match = VALUE_PATTERN.match(val)
-    if not match:
-        return None
-    val = match.group('value')
-    return int(val)
+import re 
+ 
+VALUE_PATTERN = re.compile(r"^\s*(?P<value>\d+)\s*$") 
+ 
+ 
+def resolve_value(val): 
+    match = VALUE_PATTERN.match(val) 
+    if not match: 
+        return None 
+    val = match.group('value') 
+    return int(val) 

build/plugins/print_module_type.py

@@ -1,5 +1,5 @@
 def onprint_module_type(unit, *args):
     filepath = unit.get('KIWI_OUT_FILE')
-    if len(args) >= 2 and filepath is not None:
+    if len(args) >= 2 and filepath is not None: 
         with open(filepath, "a") as file_handler:
             print >>file_handler, "{0} {1} {2}".format(args[0], args[1], unit.path())