From c1ca2f98fe4ba9ebad62042288bdb67d44849a8e Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Tue, 21 Feb 2017 15:41:30 +0000 Subject: [PATCH] Renamed methods --- wa/target/manager.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wa/target/manager.py b/wa/target/manager.py index dfe71c8b..2ee09c34 100644 --- a/wa/target/manager.py +++ b/wa/target/manager.py @@ -18,6 +18,7 @@ from wa.utils.serializer import json from devlib import LocalLinuxTarget, LinuxTarget, AndroidTarget +from devlib.utils.types import identifier # from wa.target.manager import AndroidTargetManager, LinuxTargetManager # from wa.framework.plugin import Plugin, Parameter @@ -64,9 +65,9 @@ class TargetManager(object): # Determine platform and target based on passed name self._parse_name() # Create target - self._getTarget() + self._get_target() # Create an assistant to perform target specific configuration - self._getAssistant() + self._get_assistant() ### HERE FOR TESTING, WILL BE CALLED EXTERNALLY ### # Connect to device and retrieve details. @@ -118,9 +119,8 @@ class TargetManager(object): def _parse_name(self): # Try and get platform and target - if '-' in self.name: - self.platform_name, self.target_name = self.name.split('-', 1) - elif '_' in self.name: + self.name = identifier(self.name.replace('-', '_')) + if '_' in self.name: self.platform_name, self.target_name = self.name.split('_', 1) elif self.name in self.DEVICE_MAPPING: self.platform_name = self.DEVICE_MAPPING[self.name]['platform_name']