Update for Python 3.7 (broke syntax backwards compatibility) and update year and email1.20

Signed-off-by: Mattias Andrée <maandree@kth.se>

45 files changed, 121 insertions, 121 deletions

diff --git a/examples/compact b/examples/compact
index 8f4df79..932fd8f 100644
--- a/examples/compact
+++ b/examples/compact
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -265,7 +265,7 @@ class MyXMonad(Entry):
         self.show_full = False
         self.short_layout = None
         Entry.__init__(self, *args, **kwargs)
-        async(lambda : forever(t(self.refresh)), name = 'xmonad')
+        xasync(lambda : forever(t(self.refresh)), name = 'xmonad')
     
     def action(self, col, button, x, y):
         if button == MIDDLE_BUTTON:
@@ -566,7 +566,7 @@ class MyComputer(Entry):
             self.invalidate()
         elif button == RIGHT_BUTTON:
             if self.display == 0:
-                async(lambda : subprocess.Popen(['mate-system-monitor']).wait())
+                xasync(lambda : subprocess.Popen(['mate-system-monitor']).wait())
             else:
                 self.invalidate()
         elif button == SCROLL_UP:
@@ -703,7 +703,7 @@ class MyWeather(Entry):
         self.station = 0
         self.updated = False
         self.segments = []
-        self.refresh = Sometimes(lambda : async(self.refresh_, name = 'weather'), 20 * 60 * 4)
+        self.refresh = Sometimes(lambda : xasync(self.refresh_, name = 'weather'), 20 * 60 * 4)
         self.refresh()
         Entry.__init__(self, *args, **kwargs)
     
@@ -1104,13 +1104,13 @@ class MyNews(Entry):
             self.status_path = HOME + '/.var/lib/featherweight/status'
         self.get_news()
         Entry.__init__(self, *args, **kwargs)
-        async(self.refresh, name = 'news')
+        xasync(self.refresh, name = 'news')
     
     def action(self, col, button, x, y):
         if button == LEFT_BUTTON:
-            async(lambda : subprocess.Popen([TERMINAL, '-e', 'featherweight']).wait())
+            xasync(lambda : subprocess.Popen([TERMINAL, '-e', 'featherweight']).wait())
         elif button == RIGHT_BUTTON:
-            async(lambda : subprocess.Popen(['featherweight', '--update', '--system']).wait())
+            xasync(lambda : subprocess.Popen(['featherweight', '--update', '--system']).wait())
     
     def get_news(self):
         try:
@@ -1173,7 +1173,7 @@ class MyALSA(Entry):
         self.sep_width = Bar.coloured_length(SEPARATOR)
         self.get_volume()
         Entry.__init__(self, *args, **kwargs)
-        async((self.refresh_posix_ipc, self.refresh_cmdipc, self.refresh_wait)[method], name = 'alsa')
+        xasync((self.refresh_posix_ipc, self.refresh_cmdipc, self.refresh_wait)[method], name = 'alsa')
     
     def action(self, col, button, x, y):
         mixer = 0
@@ -2309,7 +2309,7 @@ class MyTop(Entry):
         self.top_cmd = pdeath('HUP', 'top', '-b', '-n', '1', '-o', '%CPU', '-w', '10000')
         self.refresh()
         Entry.__init__(self, *args, **kwargs)
-        async(lambda : watch(5, t(self.refresh)), name = 'top')
+        xasync(lambda : watch(5, t(self.refresh)), name = 'top')
     
     def action(self, col, button, x, y):
         if button == LEFT_BUTTON:
@@ -2380,13 +2380,13 @@ class MyMOC(Entry):
                 if col % 3 == 2:
                     return
                 col //= 3
-                if   col == 0:           async(lambda : moc.play().wait())
-                elif col == 1:           async(lambda : moc.toggle_pause().wait())
-                elif col == 2:           async(lambda : moc.stop().wait())
-                elif col == 3:           async(lambda : moc.previous().wait())
-                elif col == 4:           async(lambda : moc.next().wait())
-            elif button == SCROLL_UP:    async(lambda : moc.seek(+5).wait())
-            elif button == SCROLL_DOWN:  async(lambda : moc.seek(-5).wait())
+                if   col == 0:           xasync(lambda : moc.play().wait())
+                elif col == 1:           xasync(lambda : moc.toggle_pause().wait())
+                elif col == 2:           xasync(lambda : moc.stop().wait())
+                elif col == 3:           xasync(lambda : moc.previous().wait())
+                elif col == 4:           xasync(lambda : moc.next().wait())
+            elif button == SCROLL_UP:    xasync(lambda : moc.seek(+5).wait())
+            elif button == SCROLL_DOWN:  xasync(lambda : moc.seek(-5).wait())
     
     def function_display_(self):
         moc = MOC()
@@ -2415,15 +2415,15 @@ class MyIPAddress(Entry):
         Entry.__init__(self, *args, **kwargs)
         def init():
             self.refresh()
-            async(lambda : Clock(sync_to = 10 * Clock.MINUTES).continuous_sync(t(self.refresh)), name = 'ipaddress')
-        async(init, name = 'ipaddress')
+            xasync(lambda : Clock(sync_to = 10 * Clock.MINUTES).continuous_sync(t(self.refresh)), name = 'ipaddress')
+        xasync(init, name = 'ipaddress')
     
     def action(self, col, button, x, y):
         if button == LEFT_BUTTON:
             self.show_public = not self.show_public
             self.invalidate()
         elif button == RIGHT_BUTTON:
-            async(self.refresh, name = 'ipaddress')
+            xasync(self.refresh, name = 'ipaddress')
         elif button in (SCROLL_UP, SCROLL_DOWN):
             nic = self.show_nic
             if nic is None:
@@ -2492,8 +2492,8 @@ class MyLeapsec(Entry):
         Entry.__init__(self, *args, **kwargs)
         def init():
             self.refresh()
-            async(lambda : Clock(sync_to = Clock.MINUTES).continuous_sync(Sometimes(t(self.refresh), 12 * 60)), name = 'leapsec')
-        async(init, name = 'leapsec')
+            xasync(lambda : Clock(sync_to = Clock.MINUTES).continuous_sync(Sometimes(t(self.refresh), 12 * 60)), name = 'leapsec')
+        xasync(init, name = 'leapsec')
     
     def action(self, col, button, x, y):
         if button == RIGHT_BUTTON:
@@ -2632,8 +2632,8 @@ class MyTimer(Entry):
             return self.dur(countdown)
         if not self.notified:
             self.notified = True
-            async(self.notify, name = 'timer notify')
-            async(self.wall, name = 'timer wall')
+            xasync(self.notify, name = 'timer notify')
+            xasync(self.wall, name = 'timer wall')
         countdown %= 2
         if countdown == 0:
             return '\033[37;41mYou are done\033[00m'
@@ -2718,8 +2718,8 @@ def start():
     start_()
     bar.clear()
     get_display().flush()
-    async(lambda : clock.continuous_sync(t(update_per_clock)), name = 'clock')
-    async(mqueue_wait, name = 'mqueue')
+    xasync(lambda : clock.continuous_sync(t(update_per_clock)), name = 'clock')
+    xasync(mqueue_wait, name = 'mqueue')
 
 def redraw():
     if semaphore.acquire(blocking = False):
diff --git a/examples/launchers b/examples/launchers
index 4c451e0..95e5c0a 100644
--- a/examples/launchers
+++ b/examples/launchers
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -114,7 +114,7 @@ def start():
                 os.wait()
             except:
                 time.sleep(3)
-    async(reaper, name = 'reaper')
+    xasync(reaper, name = 'reaper')
 
 
 def redraw():
diff --git a/examples/mixed b/examples/mixed
index 4d03023..bbc4bcc 100644
--- a/examples/mixed
+++ b/examples/mixed
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -54,8 +54,8 @@ def start():
         Clocked.update_all(functions)
         bar.invalidate()
     
-    async(lambda : forever(read_stdin))
-    async(lambda : clock_.continuous_sync(update_per_clock))
+    xasync(lambda : forever(read_stdin))
+    xasync(lambda : clock_.continuous_sync(update_per_clock))
 
 
 semaphore = threading.Semaphore()
diff --git a/examples/moderate b/examples/moderate
index 7204ecb..f6a6e51 100644
--- a/examples/moderate
+++ b/examples/moderate
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -572,8 +572,8 @@ def start():
             bar.invalidate()
     
     # Start monitoring
-    async(lambda : watch(1 / TICKS_PER_SECOND, update_sys), name = 'sys')
-    async(lambda : my_clock.continuous_sync(update_clock), name = 'clock')
+    xasync(lambda : watch(1 / TICKS_PER_SECOND, update_sys), name = 'sys')
+    xasync(lambda : my_clock.continuous_sync(update_clock), name = 'clock')
 
 
 
@@ -689,15 +689,15 @@ def button_pressed(y, lx, rx, button):
             elif stops_r0[4] > rx >= stops_r0[5]: # moc
                 mx = stops_r0[4] - rx - 1 - 5
                 if button == LEFT_BUTTON:
-                    if    0 <= mx <  1:          async(lambda : moc_controller.play().wait())         # >
-                    elif  2 <= mx <  4:          async(lambda : moc_controller.toggle_pause().wait()) # ||
-                    elif  5 <= mx <  7:          async(lambda : moc_controller.stop().wait())         # []
-                    elif  8 <= mx < 10:          async(lambda : moc_controller.previous().wait())     # |<
-                    elif 11 <= mx < 13:          async(lambda : moc_controller.next().wait())         # >|
-                elif button == FORWARD_BUTTON:   async(lambda : moc_controller.next().wait())
-                elif button == BACKWARD_BUTTON:  async(lambda : moc_controller.previous().wait())
-                elif button == SCROLL_UP:        async(lambda : moc_controller.seek(+5).wait())
-                elif button == SCROLL_DOWN:      async(lambda : moc_controller.seek(-5).wait())
+                    if    0 <= mx <  1:          xasync(lambda : moc_controller.play().wait())         # >
+                    elif  2 <= mx <  4:          xasync(lambda : moc_controller.toggle_pause().wait()) # ||
+                    elif  5 <= mx <  7:          xasync(lambda : moc_controller.stop().wait())         # []
+                    elif  8 <= mx < 10:          xasync(lambda : moc_controller.previous().wait())     # |<
+                    elif 11 <= mx < 13:          xasync(lambda : moc_controller.next().wait())         # >|
+                elif button == FORWARD_BUTTON:   xasync(lambda : moc_controller.next().wait())
+                elif button == BACKWARD_BUTTON:  xasync(lambda : moc_controller.previous().wait())
+                elif button == SCROLL_UP:        xasync(lambda : moc_controller.seek(+5).wait())
+                elif button == SCROLL_DOWN:      xasync(lambda : moc_controller.seek(-5).wait())
     except:
         pass
 
diff --git a/examples/plugins/alsa b/examples/plugins/alsa
index 3aa9efd..9ebd3db 100644
--- a/examples/plugins/alsa
+++ b/examples/plugins/alsa
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ cardnames = ALSA.get_cards()
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 text_v = lambda v : '--%' if v is None else ('%2i%%' % v)[:3]
 read_m = lambda m : '%s: %s' % (m.mixername, ' '.join(text_v(v) for v in m.get_volume()))
diff --git a/examples/plugins/chase b/examples/plugins/chase
index 14f32e9..a296fef 100644
--- a/examples/plugins/chase
+++ b/examples/plugins/chase
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ def start():
     def update():
         chase_.update()
         bar.invalidate()
-    async(update)
+    xasync(update)
 
 
 def redraw():
diff --git a/examples/plugins/clock b/examples/plugins/clock
index 1c275af..f6969a3 100644
--- a/examples/plugins/clock
+++ b/examples/plugins/clock
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(format = '%Y-(%m)%b-%d %T, %a w%V, %Z', utc = True, sync_to = Cloc
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/cpu b/examples/plugins/cpu
index 0e4efcf..91701c1 100644
--- a/examples/plugins/cpu
+++ b/examples/plugins/cpu
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS / 2)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 last_cpu_idle, last_cpu_total = 0, 0
diff --git a/examples/plugins/cpuinfo b/examples/plugins/cpuinfo
index 9039186..2597ad0 100644
--- a/examples/plugins/cpuinfo
+++ b/examples/plugins/cpuinfo
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = 2.5 * Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/cpuonline b/examples/plugins/cpuonline
index 300145f..b75ba4d 100644
--- a/examples/plugins/cpuonline
+++ b/examples/plugins/cpuonline
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/examples/plugins/dentrystate b/examples/plugins/dentrystate
index dcb3b6a..91eb988 100644
--- a/examples/plugins/dentrystate
+++ b/examples/plugins/dentrystate
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/df b/examples/plugins/df
index 4132911..53701a0 100644
--- a/examples/plugins/df
+++ b/examples/plugins/df
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ clock = Clock(sync_to = 5 * Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/discstats b/examples/plugins/discstats
index 3efc3ef..74de112 100644
--- a/examples/plugins/discstats
+++ b/examples/plugins/discstats
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ clock = Clock(sync_to = 5 * Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/files b/examples/plugins/files
index 51a228c..bfd2f5b 100644
--- a/examples/plugins/files
+++ b/examples/plugins/files
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/image b/examples/plugins/image
index 1058362..9b8ee06 100644
--- a/examples/plugins/image
+++ b/examples/plugins/image
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/examples/plugins/inodestate b/examples/plugins/inodestate
index 422196b..319c5c6 100644
--- a/examples/plugins/inodestate
+++ b/examples/plugins/inodestate
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/inotify b/examples/plugins/inotify
index 4afc461..5a6399e 100644
--- a/examples/plugins/inotify
+++ b/examples/plugins/inotify
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/examples/plugins/ipaddress b/examples/plugins/ipaddress
index d2b8a13..8c8c7aa 100644
--- a/examples/plugins/ipaddress
+++ b/examples/plugins/ipaddress
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = 30 * Clock.MINUTES)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/kmsg b/examples/plugins/kmsg
index 5dc34ae..6e8732d 100644
--- a/examples/plugins/kmsg
+++ b/examples/plugins/kmsg
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ def start():
             import sys
             sys.exit() # kill thread
         bar.invalidate()
-    async(lambda : forever(refresh))
+    xasync(lambda : forever(refresh))
 
 def redraw():
     bar.clear()
diff --git a/examples/plugins/leapsec b/examples/plugins/leapsec
index 1b8021e..1c8dfee 100644
--- a/examples/plugins/leapsec
+++ b/examples/plugins/leapsec
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = 0.5 * Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 leapsec_ = Sometimes(LeapSeconds, 30 * 24 * 60 * 2)
diff --git a/examples/plugins/loadavg b/examples/plugins/loadavg
index 32f1ea1..e372476 100644
--- a/examples/plugins/loadavg
+++ b/examples/plugins/loadavg
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/locks b/examples/plugins/locks
index edaf4c9..4cce02d 100644
--- a/examples/plugins/locks
+++ b/examples/plugins/locks
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -87,7 +87,7 @@ def locate_files():
 start_ = start
 def start():
     start_()
-    async(locate_files)
+    xasync(locate_files)
 
 
 semaphore = threading.Semaphore()
diff --git a/examples/plugins/lunar b/examples/plugins/lunar
index 4254ab7..91600f1 100644
--- a/examples/plugins/lunar
+++ b/examples/plugins/lunar
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/mem b/examples/plugins/mem
index b9ca220..6e591a5 100644
--- a/examples/plugins/mem
+++ b/examples/plugins/mem
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/moc b/examples/plugins/moc
index 037ed0c..61a7665 100644
--- a/examples/plugins/moc
+++ b/examples/plugins/moc
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 line2 = ['File', 'Title', 'SongTitle', 'Album', 'Artist']
diff --git a/examples/plugins/network b/examples/plugins/network
index 892775f..6264029 100644
--- a/examples/plugins/network
+++ b/examples/plugins/network
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 net_time = time.monotonic()
diff --git a/examples/plugins/pacman b/examples/plugins/pacman
index 680b110..c7a1564 100644
--- a/examples/plugins/pacman
+++ b/examples/plugins/pacman
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = 30 * Clock.MINUTES)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/ping b/examples/plugins/ping
index b666295..0710296 100644
--- a/examples/plugins/ping
+++ b/examples/plugins/ping
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ ping_ = Ping(targets = Ping.get_nics(Ping.DEFAULT_GATEWAY), interval = 2)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def colourise_latency(latency):
diff --git a/examples/plugins/random b/examples/plugins/random
index c4d9741..907c342 100644
--- a/examples/plugins/random
+++ b/examples/plugins/random
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 random_ = Random()
diff --git a/examples/plugins/ropty b/examples/plugins/ropty
index c46ab84..dc9e08f 100644
--- a/examples/plugins/ropty
+++ b/examples/plugins/ropty
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/examples/plugins/snmp b/examples/plugins/snmp
index cdde03d..d514ae8 100644
--- a/examples/plugins/snmp
+++ b/examples/plugins/snmp
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ index = 0
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 def redraw():
     text = '%s: %i' % (keys[index], SNMP()[keys[index]])
diff --git a/examples/plugins/snmp6 b/examples/plugins/snmp6
index 0535543..7d9e080 100644
--- a/examples/plugins/snmp6
+++ b/examples/plugins/snmp6
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ index = 0
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 def redraw():
     text = '%s: %i' % (keys[index], SNMP6()[keys[index]])
diff --git a/examples/plugins/softirqs b/examples/plugins/softirqs
index 2d79206..c92d41a 100644
--- a/examples/plugins/softirqs
+++ b/examples/plugins/softirqs
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ hz = lambda n, l, t : '%.fHz' % ((n - l) / t)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 def redraw():
     global last_irqs, last_time
diff --git a/examples/plugins/swaps b/examples/plugins/swaps
index cd36f0d..27abf16 100644
--- a/examples/plugins/swaps
+++ b/examples/plugins/swaps
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 swaps_ = Swaps()
diff --git a/examples/plugins/tzclock b/examples/plugins/tzclock
index a9e12e0..e9dd465 100644
--- a/examples/plugins/tzclock
+++ b/examples/plugins/tzclock
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ timezones = [pacific, central, utc, sthlm, kalinin, tokyo]
 start_ = start
 def start():
     start_()
-    async(lambda : utc.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : utc.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/uname b/examples/plugins/uname
index a87b9f2..c75cd1d 100644
--- a/examples/plugins/uname
+++ b/examples/plugins/uname
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = 30 * Clock.MINUTES)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/uptime b/examples/plugins/uptime
index e91c659..9929a00 100644
--- a/examples/plugins/uptime
+++ b/examples/plugins/uptime
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/users b/examples/plugins/users
index f6a97c0..a4bdbe7 100644
--- a/examples/plugins/users
+++ b/examples/plugins/users
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/vmstat b/examples/plugins/vmstat
index 68a01f3..bcb826d 100644
--- a/examples/plugins/vmstat
+++ b/examples/plugins/vmstat
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ index = 0
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 def redraw():
     text = '%s: %i' % (''.join(w[0].upper() + w[1:] for w in keys[index].split('_')), VMStat()[keys[index]])
diff --git a/examples/plugins/xdisplay b/examples/plugins/xdisplay
index 4f24525..ed0d1d7 100644
--- a/examples/plugins/xdisplay
+++ b/examples/plugins/xdisplay
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = 30 * Clock.MINUTES)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/plugins/xkb b/examples/plugins/xkb
index 886d1ab..129f18e 100644
--- a/examples/plugins/xkb
+++ b/examples/plugins/xkb
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ clock = Clock(sync_to = Clock.SECONDS / 4)
 start_ = start
 def start():
     start_()
-    async(lambda : clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(lambda : clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/test b/examples/test
index 63b3242..39b7996 100644
--- a/examples/test
+++ b/examples/test
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/examples/tricks/anytzclock b/examples/tricks/anytzclock
index 44bc936..9ac1d46 100644
--- a/examples/tricks/anytzclock
+++ b/examples/tricks/anytzclock
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -84,8 +84,8 @@ def mqueue_wait():
 start_ = start
 def start():
     start_()
-    async(mqueue_wait)
-    async(lambda : local_clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(mqueue_wait)
+    xasync(lambda : local_clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/tricks/localutcclock b/examples/tricks/localutcclock
index e3bf6f4..db2baa4 100644
--- a/examples/tricks/localutcclock
+++ b/examples/tricks/localutcclock
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -70,8 +70,8 @@ def mqueue_wait():
 start_ = start
 def start():
     start_()
-    async(mqueue_wait)
-    async(lambda : local_clock.continuous_sync(lambda : bar.invalidate()))
+    xasync(mqueue_wait)
+    xasync(lambda : local_clock.continuous_sync(lambda : bar.invalidate()))
 
 
 def redraw():
diff --git a/examples/xmonad b/examples/xmonad
index d112950..6b98426 100644
--- a/examples/xmonad
+++ b/examples/xmonad
@@ -1,7 +1,7 @@
 # -*- python -*-
 '''
 xpybar – xmobar replacement written in python
-Copyright © 2014, 2015, 2016, 2017  Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2014, 2015, 2016, 2017, 2018  Mattias Andrée (maandree@kth.se)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ def start():
         except:
             sys.exit(0)
         bar.invalidate()
-    async(lambda : forever(refresh))
+    xasync(lambda : forever(refresh))
 
 
 def redraw():