Merge pull request #599 from ultrabug/battery-level-fix

Battery_level: Prevent logic issues when zero
ultrabug · Dec 23, 2016 · 56da7ba · 56da7ba
2 parents b2eedd0 + c758216
commit 56da7ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/py3status/modules/battery_level.py b/py3status/modules/battery_level.py
@@ -277,9 +277,9 @@ def _parse_battery_info(sys_path):
         for path in iglob(os.path.join(self.sys_battery_path, "BAT*")):
             r = _parse_battery_info(path)
 
-            capacity = r.get("POWER_SUPPLY_ENERGY_FULL") or r.get("POWER_SUPPLY_CHARGE_FULL")
-            present_rate = r.get("POWER_SUPPLY_POWER_NOW") or r.get("POWER_SUPPLY_CURRENT_NOW")
-            remaining_energy = r.get("POWER_SUPPLY_ENERGY_NOW") or r.get("POWER_SUPPLY_CHARGE_NOW")
+            capacity = r.get("POWER_SUPPLY_ENERGY_FULL", r.get("POWER_SUPPLY_CHARGE_FULL"))
+            present_rate = r.get("POWER_SUPPLY_POWER_NOW", r.get("POWER_SUPPLY_CURRENT_NOW"))
+            remaining_energy = r.get("POWER_SUPPLY_ENERGY_NOW", r.get("POWER_SUPPLY_CHARGE_NOW"))
 
             battery = {}
             battery["capacity"] = capacity