From 612b8b07eb1b5b41907652936ab80bfe761dfb92 Mon Sep 17 00:00:00 2001
From: enkore <public@enkore.de>
Date: Wed, 27 Jan 2016 19:53:33 +0100
Subject: [PATCH] Update modules to a7583a9

Not updated for various reasons:
clock,
dpms,
gpu_temp,
load,
mail,
mem_bar,
modsde,
net_speed,
pianobar,
pulseaudio,
regex [no named formatters],
runwatch,
shell,
solaar,
temp,
text,
updates,
weather,
whosonlocation,
xkblayout,
zabbix


This might break something: I can't test all these modules. If it does,
file a bug / open a PR / send me a note.
---
 i3pystatus/alsa.py            |  1 +
 i3pystatus/battery.py         |  1 +
 i3pystatus/bitcoin.py         |  1 +
 i3pystatus/cmus.py            |  2 ++
 i3pystatus/core/util.py       |  2 +-
 i3pystatus/cpu_freq.py        |  1 +
 i3pystatus/cpu_usage.py       |  1 +
 i3pystatus/cpu_usage_bar.py   |  1 +
 i3pystatus/cpu_usage_graph.py |  1 +
 i3pystatus/disk.py            |  1 +
 i3pystatus/dota2wins.py       |  1 +
 i3pystatus/file.py            |  1 +
 i3pystatus/github.py          |  1 +
 i3pystatus/gpu_mem.py         |  1 +
 i3pystatus/iinet.py           |  1 +
 i3pystatus/keyboard_locks.py  | 10 +++++-----
 i3pystatus/makewatch.py       |  1 +
 i3pystatus/mem.py             |  1 +
 i3pystatus/moon.py            |  1 +
 i3pystatus/mpd.py             |  5 +++--
 i3pystatus/network.py         |  1 +
 i3pystatus/now_playing.py     |  3 +++
 i3pystatus/openstack_vms.py   |  1 +
 i3pystatus/openvpn.py         |  1 +
 i3pystatus/parcel.py          |  1 +
 i3pystatus/plexstatus.py      |  1 +
 i3pystatus/pomodoro.py        |  2 +-
 i3pystatus/pyload.py          |  1 +
 i3pystatus/reddit.py          |  1 +
 i3pystatus/sge.py             |  1 +
 i3pystatus/spotify.py         |  2 ++
 i3pystatus/uname.py           |  1 +
 i3pystatus/uptime.py          |  2 +-
 33 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/i3pystatus/alsa.py b/i3pystatus/alsa.py
index ba52e74..c2e67fb 100644
--- a/i3pystatus/alsa.py
+++ b/i3pystatus/alsa.py
@@ -92,6 +92,7 @@ class ALSA(IntervalModule):
         else:
             output_format = self.format
 
+        self.data = fdict
         self.output = {
             "full_text": output_format.format(**self.fdict),
             "color": self.color_muted if muted else self.color,
diff --git a/i3pystatus/battery.py b/i3pystatus/battery.py
index e7ad98d..93eef7d 100644
--- a/i3pystatus/battery.py
+++ b/i3pystatus/battery.py
@@ -313,6 +313,7 @@ class BatteryChecker(IntervalModule):
 
         fdict["status"] = self.status[fdict["status"]]
 
+        self.data = fdict
         self.output = {
             "full_text": formatp(self.format, **fdict),
             "instance": self.battery_ident,
diff --git a/i3pystatus/bitcoin.py b/i3pystatus/bitcoin.py
index 8c89c9f..a6ca236 100644
--- a/i3pystatus/bitcoin.py
+++ b/i3pystatus/bitcoin.py
@@ -120,6 +120,7 @@ class Bitcoin(IntervalModule):
                 else:
                     fdict["last_tx_type"] = "sent"
 
+        self.data = fdict
         self.output = {
             "full_text": self.format.format(**fdict),
             "color": color,
diff --git a/i3pystatus/cmus.py b/i3pystatus/cmus.py
index dd2cec4..ecfc37a 100644
--- a/i3pystatus/cmus.py
+++ b/i3pystatus/cmus.py
@@ -95,10 +95,12 @@ class Cmus(IntervalModule):
                 filename = os.path.basename(fdict['file'])
                 filebase, _ = os.path.splitext(filename)
                 fdict['artist'], fdict['title'] = _extract_artist_title(filebase)
+            self.data = fdict
             self.output = {"full_text": formatp(self.format, **fdict),
                            "color": self.color}
 
         else:
+            if hasattr(self, "data"): del self.data
             self.output = {"full_text": self.format_not_running,
                            "color": self.color_not_running}
 
diff --git a/i3pystatus/core/util.py b/i3pystatus/core/util.py
index c5169f4..4de7671 100644
--- a/i3pystatus/core/util.py
+++ b/i3pystatus/core/util.py
@@ -112,7 +112,7 @@ class KeyConstraintDict(collections.UserDict):
 
     def __delitem__(self, key):
         self.seen_keys.remove(key)
-        del self.data[key]
+        if hasattr(self, "data"): del self.data[key]
 
     def __iter__(self):
         """Iteration will raise a MissingKeys exception unless all required keys are set
diff --git a/i3pystatus/cpu_freq.py b/i3pystatus/cpu_freq.py
index 7e283e6..cdc4176 100644
--- a/i3pystatus/cpu_freq.py
+++ b/i3pystatus/cpu_freq.py
@@ -43,6 +43,7 @@ class CpuFreq(IntervalModule):
     def run(self):
         cdict = self.createvaluesdict()
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": self.color,
diff --git a/i3pystatus/cpu_usage.py b/i3pystatus/cpu_usage.py
index ad1ff2f..b99b12f 100644
--- a/i3pystatus/cpu_usage.py
+++ b/i3pystatus/cpu_usage.py
@@ -118,6 +118,7 @@ class CpuUsage(IntervalModule):
         # for backward compatibility
         usage['usage'] = usage['usage_cpu']
 
+        self.data = usage
         self.output = {
             "full_text": self.format.format_map(usage),
             "color": self.color
diff --git a/i3pystatus/cpu_usage_bar.py b/i3pystatus/cpu_usage_bar.py
index 2bf06e5..fe0cbf0 100644
--- a/i3pystatus/cpu_usage_bar.py
+++ b/i3pystatus/cpu_usage_bar.py
@@ -55,6 +55,7 @@ class CpuUsageBar(CpuUsage, ColorRangeModule):
         # for backward compatibility
         cpu_usage['usage_bar'] = cpu_usage['usage_bar_cpu']
 
+        self.data = cpu_usage
         self.output = {
             "full_text": self.format.format_map(cpu_usage),
             'color': self.get_gradient(cpu_usage[self.cpu], self.colors, 100)
diff --git a/i3pystatus/cpu_usage_graph.py b/i3pystatus/cpu_usage_graph.py
index 2de0b18..ec3f2bc 100644
--- a/i3pystatus/cpu_usage_graph.py
+++ b/i3pystatus/cpu_usage_graph.py
@@ -50,6 +50,7 @@ class CpuUsageGraph(CpuUsage, ColorRangeModule):
         format_options.update({'cpu_graph': graph})
 
         color = self.get_gradient(core_reading, self.colors)
+        self.data = format_options
         self.output = {
             "full_text": self.format.format_map(format_options),
             'color': color
diff --git a/i3pystatus/disk.py b/i3pystatus/disk.py
index 5b131ac..5b130f2 100644
--- a/i3pystatus/disk.py
+++ b/i3pystatus/disk.py
@@ -77,6 +77,7 @@ class Disk(IntervalModule):
         }
         round_dict(cdict, self.round_size)
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": self.critical_color if critical else self.color,
diff --git a/i3pystatus/dota2wins.py b/i3pystatus/dota2wins.py
index 9c4a75d..958573d 100644
--- a/i3pystatus/dota2wins.py
+++ b/i3pystatus/dota2wins.py
@@ -104,6 +104,7 @@ class Dota2wins(IntervalModule):
             "win_percent": win_percent,
         }
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": color
diff --git a/i3pystatus/file.py b/i3pystatus/file.py
index 7663d9e..cb1daf8 100644
--- a/i3pystatus/file.py
+++ b/i3pystatus/file.py
@@ -45,6 +45,7 @@ class File(IntervalModule):
         for key, transform in self.transforms.items():
             cdict[key] = transform(cdict)
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": self.color
diff --git a/i3pystatus/github.py b/i3pystatus/github.py
index 24ed556..22a3f8c 100644
--- a/i3pystatus/github.py
+++ b/i3pystatus/github.py
@@ -57,6 +57,7 @@ class Github(IntervalModule):
             format_values['unread_count'] = unread
             format_values['unread'] = self.unread_marker
 
+        self.data = format_values
         self.output = {
             'full_text': self.format.format(**format_values),
             'color': self.color
diff --git a/i3pystatus/gpu_mem.py b/i3pystatus/gpu_mem.py
index c8118c1..068fc36 100644
--- a/i3pystatus/gpu_mem.py
+++ b/i3pystatus/gpu_mem.py
@@ -62,6 +62,7 @@ class GPUMemory(IntervalModule):
             if value is not None:
                 cdict[key] = round(value, self.round_size)
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": color
diff --git a/i3pystatus/iinet.py b/i3pystatus/iinet.py
index 83be78a..784e137 100644
--- a/i3pystatus/iinet.py
+++ b/i3pystatus/iinet.py
@@ -76,6 +76,7 @@ class IINet(IntervalModule, ColorRangeModule):
         usage['percent_used'] = '{0:.2f}%'.format(percent_used)
         usage['percent_available'] = '{0:.2f}%'.format(percent_avaliable)
 
+        self.data = usage
         self.output = {
             "full_text": self.format.format(**usage),
             "color": color
diff --git a/i3pystatus/keyboard_locks.py b/i3pystatus/keyboard_locks.py
index d39378a..3b0b8a1 100644
--- a/i3pystatus/keyboard_locks.py
+++ b/i3pystatus/keyboard_locks.py
@@ -35,7 +35,7 @@ class Keyboard_locks(IntervalModule):
     scroll_on = "SCR"
     scroll_off = "___"
     color = "#FFFFFF"
-    fdict = {}
+    data = {}
 
     def get_status(self):
         xset = str(subprocess.check_output(["xset", "q"]))
@@ -46,13 +46,13 @@ class Keyboard_locks(IntervalModule):
 
     def run(self):
         (cap, num, scr) = self.get_status()
-        self.fdict["caps"] = self.caps_on if cap else self.caps_off
-        self.fdict["num"] = self.num_on if num else self.num_off
-        self.fdict["scroll"] = self.scroll_on if scr else self.scroll_off
+        self.data["caps"] = self.caps_on if cap else self.caps_off
+        self.data["num"] = self.num_on if num else self.num_off
+        self.data["scroll"] = self.scroll_on if scr else self.scroll_off
 
         output_format = self.format
 
         self.output = {
-            "full_text": output_format.format(**self.fdict),
+            "full_text": output_format.format(**self.data),
             "color": self.color,
         }
diff --git a/i3pystatus/makewatch.py b/i3pystatus/makewatch.py
index be3bd0f..22cf00c 100644
--- a/i3pystatus/makewatch.py
+++ b/i3pystatus/makewatch.py
@@ -38,6 +38,7 @@ class MakeWatch(IntervalModule):
             "status": status
         }
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": color
diff --git a/i3pystatus/mem.py b/i3pystatus/mem.py
index dc0e018..90a4517 100644
--- a/i3pystatus/mem.py
+++ b/i3pystatus/mem.py
@@ -61,6 +61,7 @@ class Mem(IntervalModule):
         }
         round_dict(cdict, self.round_size)
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": color
diff --git a/i3pystatus/moon.py b/i3pystatus/moon.py
index 932a7d3..8743aa2 100644
--- a/i3pystatus/moon.py
+++ b/i3pystatus/moon.py
@@ -105,6 +105,7 @@ class MoonPhase(IntervalModule):
             "status": self.status[self.current_phase()],
             "illum": self.illum(),
         }
+        self.data = fdict
         self.output = {
             "full_text": formatp(self.format, **fdict),
             "color": self.color[self.current_phase()],
diff --git a/i3pystatus/mpd.py b/i3pystatus/mpd.py
index 65f2405..7e9d6a9 100644
--- a/i3pystatus/mpd.py
+++ b/i3pystatus/mpd.py
@@ -91,7 +91,8 @@ class MPD(IntervalModule):
                 self.output = {
                     "full_text": ""
                 }
-                return
+            if hasattr(self, "data"): del self.data
+            return
 
         fdict = {
             "pos": int(status.get("song", 0)) + 1,
@@ -118,6 +119,7 @@ class MPD(IntervalModule):
                 if len(fdict[key]) > self.max_field_len:
                     fdict[key] = fdict[key][:self.max_field_len - 1] + "…"
 
+        self.data = fdict
         full_text = formatp(self.format, **fdict).strip()
         full_text_len = len(full_text)
         if full_text_len > self.max_len and self.max_len > 0:
@@ -128,7 +130,6 @@ class MPD(IntervalModule):
                 fdict[key] = fdict[key][:shrink] + "…"
 
             full_text = formatp(self.format, **fdict).strip()
-
         self.output = {
             "full_text": full_text,
             "color": self.color,
diff --git a/i3pystatus/network.py b/i3pystatus/network.py
index aa39099..879711f 100644
--- a/i3pystatus/network.py
+++ b/i3pystatus/network.py
@@ -393,6 +393,7 @@ class Network(IntervalModule, ColorRangeModule):
         format_values.update(network_info)
         format_values['interface'] = self.interface
 
+        self.data = format_values
         self.output = {
             "full_text": format_str.format(**format_values),
             'color': color,
diff --git a/i3pystatus/now_playing.py b/i3pystatus/now_playing.py
index bdb00e1..dc6eb2b 100644
--- a/i3pystatus/now_playing.py
+++ b/i3pystatus/now_playing.py
@@ -113,6 +113,7 @@ class NowPlaying(IntervalModule):
                 fdict["filename"] = '.'.join(
                     basename((currentsong.get("xesam:url") or "")).split('.')[:-1])
 
+            self.data = fdict
             self.output = {
                 "full_text": formatp(self.format, **fdict).strip(),
                 "color": self.color,
@@ -126,6 +127,7 @@ class NowPlaying(IntervalModule):
                     "full_text": self.format_no_player,
                     "color": self.color_no_player,
                 }
+            if hasattr(self, "data"): del self.data
             return
 
         except dbus.exceptions.DBusException as e:
@@ -136,6 +138,7 @@ class NowPlaying(IntervalModule):
                     "full_text": "DBus error: " + e.get_dbus_message(),
                     "color": "#ff0000",
                 }
+            if hasattr(self, "data"): del self.data
             return
 
     def playpause(self):
diff --git a/i3pystatus/openstack_vms.py b/i3pystatus/openstack_vms.py
index 7fb7ee1..3684857 100644
--- a/i3pystatus/openstack_vms.py
+++ b/i3pystatus/openstack_vms.py
@@ -60,6 +60,7 @@ class Openstack_vms(IntervalModule):
             "nonactive_servers": nonactive_servers,
         }
 
+        self.data = cdict
         self.output = {
             "full_text": self.format.format(**cdict),
             "color": display_color
diff --git a/i3pystatus/openvpn.py b/i3pystatus/openvpn.py
index 027be8d..48a8ef8 100644
--- a/i3pystatus/openvpn.py
+++ b/i3pystatus/openvpn.py
@@ -55,6 +55,7 @@ class OpenVPN(IntervalModule):
         vpn_name = self.vpn_name
         label = self.label
 
+        self.data = locals()
         self.output = {
             "full_text": self.format.format(**locals()),
             'color': color,
diff --git a/i3pystatus/parcel.py b/i3pystatus/parcel.py
index 1d9f58a..ce04b8f 100644
--- a/i3pystatus/parcel.py
+++ b/i3pystatus/parcel.py
@@ -162,6 +162,7 @@ class ParcelTracker(IntervalModule):
         }
         fdict.update(self.instance.status())
 
+        self.data = fdict
         self.output = {
             "full_text": self.format.format(**fdict).strip(),
             "instance": self.name,
diff --git a/i3pystatus/plexstatus.py b/i3pystatus/plexstatus.py
index f2f10a8..50f5b13 100644
--- a/i3pystatus/plexstatus.py
+++ b/i3pystatus/plexstatus.py
@@ -50,6 +50,7 @@ class Plexstatus(IntervalModule):
             except AttributeError:
                 pass
 
+        self.data = cdict
         if not cdict['title'] or not cdict['platform']:
             self.output = {} if not self.format_no_streams else {
                 "full_text": self.format_no_stream,
diff --git a/i3pystatus/pomodoro.py b/i3pystatus/pomodoro.py
index 7d6bad1..2ccd5a1 100644
--- a/i3pystatus/pomodoro.py
+++ b/i3pystatus/pomodoro.py
@@ -85,7 +85,7 @@ class Pomodoro(IntervalModule):
             'current_pomodoro': self.breaks,
             'total_pomodoro': self.short_break_count + 1,
         }
-
+        self.data = sdict
         self.output = {
             'full_text': self.format.format(**sdict),
             'color': color
diff --git a/i3pystatus/pyload.py b/i3pystatus/pyload.py
index aa41738..75dfa88 100644
--- a/i3pystatus/pyload.py
+++ b/i3pystatus/pyload.py
@@ -81,6 +81,7 @@ class pyLoad(IntervalModule):
             "free_space": self._rpc_call("freeSpace") / (1024 ** 3),
         }
 
+        self.data = fdict
         self.output = {
             "full_text": self.format.format(**fdict).strip(),
             "instance": self.address,
diff --git a/i3pystatus/reddit.py b/i3pystatus/reddit.py
index 07eceba..5a8ce0a 100644
--- a/i3pystatus/reddit.py
+++ b/i3pystatus/reddit.py
@@ -97,6 +97,7 @@ class Reddit(IntervalModule):
         else:
             color = self.color
 
+        self.data = fdict
         full_text = self.format.format(**fdict)
         self.output = {
             "full_text": full_text,
diff --git a/i3pystatus/sge.py b/i3pystatus/sge.py
index 5ffa3c4..2e0391f 100644
--- a/i3pystatus/sge.py
+++ b/i3pystatus/sge.py
@@ -49,6 +49,7 @@ class SGETracker(IntervalModule):
             "running": jobs['r']
         }
 
+        self.data = fdict
         self.output = {
             "full_text": self.format.format(**fdict).strip(),
             "color": self.color
diff --git a/i3pystatus/spotify.py b/i3pystatus/spotify.py
index a4d0987..dd2edeb 100644
--- a/i3pystatus/spotify.py
+++ b/i3pystatus/spotify.py
@@ -87,6 +87,7 @@ class Spotify(IntervalModule):
                 'artist': response.get('artist', ''),
                 'length': response.get('length', 0),
             }
+            self.data = fdict
             self.output = {"full_text": formatp(self.format, **fdict),
                            "color": self.color}
 
@@ -94,6 +95,7 @@ class Spotify(IntervalModule):
         except:
             self.output = {"full_text": self.format_not_running,
                            "color": self.color_not_running}
+            if hasattr(self, "data"): del self.data
 
     def playpause(self):
         """Pauses and plays spotify"""
diff --git a/i3pystatus/uname.py b/i3pystatus/uname.py
index c95fa47..c0fee66 100644
--- a/i3pystatus/uname.py
+++ b/i3pystatus/uname.py
@@ -30,6 +30,7 @@ class Uname(Module):
             "version": uname_result.version,
             "machine": uname_result.machine,
         }
+        self.data = fdict
         self.output = {
             "full_text": self.format.format(**fdict),
         }
diff --git a/i3pystatus/uptime.py b/i3pystatus/uptime.py
index 6027e0e..953f133 100644
--- a/i3pystatus/uptime.py
+++ b/i3pystatus/uptime.py
@@ -54,7 +54,7 @@ class Uptime(IntervalModule):
             "secs": seconds,
             "uptime": "{}:{}".format(hours, minutes),
         }
-
+        self.data = fdict
         if self.alert:
             if seconds > self.seconds_alert:
                 self.color = self.color_alert