From cceecebfa7cb4b4f298d222a47ed081e906215f1 Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Tue, 18 Apr 2017 14:40:26 +0100
Subject: [PATCH] Getters: Renamed import from `__base_filepath` to
`_base_filepath`
Previously trying to use the `__base_filepath` import from inside the `Package`
class, resulted in the error "`_Package__base_filepath` is not defined."
---
wa/framework/getters.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wa/framework/getters.py b/wa/framework/getters.py
index 651ca5a2..7c9986c6 100644
--- a/wa/framework/getters.py
+++ b/wa/framework/getters.py
@@ -31,7 +31,7 @@ import requests
from devlib.utils.android import ApkInfo
-from wa import Parameter, settings, __file__ as __base_filepath
+from wa import Parameter, settings, __file__ as _base_filepath
from wa.framework.resource import ResourceGetter, SourcePriority, NO_ONE
from wa.framework.exception import ResourceError
from wa.utils.misc import (ensure_directory_exists as _d,
@@ -96,7 +96,7 @@ class Package(ResourceGetter):
def get(self, resource):
if resource.owner == NO_ONE:
- basepath = os.path.join(os.path.dirname(__base_filepath), 'assets')
+ basepath = os.path.join(os.path.dirname(_base_filepath), 'assets')
else:
modname = resource.owner.__module__
basepath = os.path.dirname(sys.modules[modname].__file__)