From 8ebca17e798a67e0c294873e6b050485b1a3c9d0 Mon Sep 17 00:00:00 2001
From: enkore <public@enkore.de>
Date: Tue, 5 Mar 2013 17:27:12 +0100
Subject: [PATCH] Aaand some code butchering I forgot earlier.

---
 i3pystatus/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i3pystatus/__init__.py b/i3pystatus/__init__.py
index 2375f5f..4bbc9ca 100644
--- a/i3pystatus/__init__.py
+++ b/i3pystatus/__init__.py
@@ -2,9 +2,9 @@
 
 import sys
 
-from .core import io
-from .core.util import *
+from .core import util, io
 from .core.modules import *
+from .core.settings import SettingsBase
 
 __all__ = [
     "SettingsBase",
@@ -15,11 +15,11 @@ __all__ = [
 class Status:
     def __init__(self, standalone=False, interval=1, input_stream=sys.stdin):
         if standalone:
-            self.io = core.io.StandaloneIO(interval)
+            self.io = io.StandaloneIO(interval)
         else:
-            self.io = core.io.IOHandler(input_stream)
+            self.io = io.IOHandler(input_stream)
 
-        self.modules = ModuleList(self, Module)
+        self.modules = util.ModuleList(self, Module)
 
     def register(self, module, *args, **kwargs):
         """Register a new module."""
@@ -28,7 +28,7 @@ class Status:
             self.modules.append(module, *args, **kwargs)
 
     def run(self):
-        for j in core.io.JSONIO(self.io).read():
+        for j in io.JSONIO(self.io).read():
             for module in self.modules:
                 module.inject(j)
 I3statusHandler = Status