Skip to content

Commit 0ec6c06

Browse files
authored
Merge pull request #661 from powerapi-ng/refactor/cleanup-utils-package
refactor(utils): Cleanup package code
2 parents 266aa68 + 6db3968 commit 0ec6c06

File tree

5 files changed

+4
-46
lines changed

5 files changed

+4
-46
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, INRIA
1+
# Copyright (c) 2023, Inria
22
# Copyright (c) 2023, University of Lille
33
# All rights reserved.
44
#

src/powerapi/cli/config_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
SubgroupAlreadyExistException, SubgroupParserWithoutNameArgumentException, BadTypeException, \
4040
MissingArgumentException, SameLengthArgumentNamesException, InvalidPrefixException, RepeatedArgumentException, \
4141
SubgroupDoesNotExistException, AlreadyAddedSubgroupException
42-
from powerapi.utils.cli import find_longest_string_in_list, string_to_bool, to_lower_case_and_replace_separators, \
42+
from ._utils import find_longest_string_in_list, string_to_bool, to_lower_case_and_replace_separators, \
4343
get_longest_related_suffix
4444

4545

src/powerapi/cli/parsing_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from powerapi.exception import MissingArgumentException, BadTypeException, AlreadyAddedSubparserException, \
3838
UnknownArgException, MissingValueException, BadContextException, RepeatedArgumentException, \
3939
AlreadyAddedSubgroupException
40-
from powerapi.utils.cli import merge_dictionaries
40+
from ._utils import merge_dictionaries
4141

4242

4343
class BaseConfigParsingManagerInterface:

src/powerapi/utils/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021, INRIA
1+
# Copyright (c) 2021, Inria
22
# Copyright (c) 2021, University of Lille
33
# All rights reserved.
44
#
@@ -26,5 +26,3 @@
2626
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2727
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2828
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29-
30-
from .utils import timestamp_to_datetime

src/powerapi/utils/utils.py

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)