From 5eb271c684cc9a6da90d7d471f6f06deba48ec84 Mon Sep 17 00:00:00 2001 From: enkore Date: Wed, 23 Oct 2013 16:54:51 +0200 Subject: [PATCH] Remove PrefixedKeyDict (unused) --- i3pystatus/battery.py | 7 +------ i3pystatus/core/util.py | 16 ---------------- tests/test_core_util.py | 30 ------------------------------ 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/i3pystatus/battery.py b/i3pystatus/battery.py index 52669a4..9fbf4f4 100644 --- a/i3pystatus/battery.py +++ b/i3pystatus/battery.py @@ -5,12 +5,11 @@ import re import configparser from i3pystatus import IntervalModule, formatp -from i3pystatus.core.util import PrefixedKeyDict, lchop, TimeWrapper +from i3pystatus.core.util import lchop, TimeWrapper from i3pystatus.core.desktop import display_notification class UEventParser(configparser.ConfigParser): - @staticmethod def parse_file(file): parser = UEventParser() @@ -29,7 +28,6 @@ class UEventParser(configparser.ConfigParser): class Battery: - @staticmethod def create(from_file): batinfo = UEventParser.parse_file(from_file) @@ -58,7 +56,6 @@ class Battery: class BatteryCharge(Battery): - def consumption(self): return self.bat["VOLTAGE_NOW"] * self.bat["CURRENT_NOW"] # V * A = W @@ -74,7 +71,6 @@ class BatteryCharge(Battery): class BatteryEnergy(Battery): - def consumption(self): return self.bat["POWER_NOW"] @@ -90,7 +86,6 @@ class BatteryEnergy(Battery): class BatteryChecker(IntervalModule): - """ This class uses the /sys/class/power_supply/…/uevent interface to check for the battery status diff --git a/i3pystatus/core/util.py b/i3pystatus/core/util.py index befd129..65786d0 100644 --- a/i3pystatus/core/util.py +++ b/i3pystatus/core/util.py @@ -89,22 +89,6 @@ class ModuleList(collections.UserList): return module -class PrefixedKeyDict(collections.UserDict): - """ - A dict implementation adding a prefix to every key added - - :param prefix: Prefix to prepend - """ - - def __init__(self, prefix): - super().__init__() - - self.prefix = prefix - - def __setitem__(self, key, value): - super().__setitem__(self.prefix + key, value) - - class KeyConstraintDict(collections.UserDict): """ A dict implementation with sets of valid and required keys diff --git a/tests/test_core_util.py b/tests/test_core_util.py index 6c79a1a..69aa828 100644 --- a/tests/test_core_util.py +++ b/tests/test_core_util.py @@ -4,7 +4,6 @@ import unittest from unittest.mock import MagicMock import string import random -import sys import types from i3pystatus.core import util @@ -187,35 +186,6 @@ class ModuleListTests(unittest.TestCase): cls.registered.assert_called_with(self.status_handler) -class PrefixedKeyDictTests(unittest.TestCase): - - def test_no_prefix(self): - dict = util.PrefixedKeyDict("") - dict["foo"] = None - dict["bar"] = 42 - - assert dict["foo"] == None - assert dict["bar"] == 42 - - def test_prefix(self): - dict = util.PrefixedKeyDict("pfx_") - dict["foo"] = None - dict["bar"] = 42 - - assert dict["pfx_foo"] == None - assert dict["pfx_bar"] == 42 - - def test_dict(self): - d = util.PrefixedKeyDict("pfx_") - d["foo"] = None - d["bar"] = 42 - - realdict = dict(d) - - assert realdict["pfx_foo"] == None - assert realdict["pfx_bar"] == 42 - - class KeyConstraintDictAdvancedTests(unittest.TestCase): def test_invalid_1(self):