3 files changed, 6 insertions, 11 deletions
diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index aad91fc..10f10aa 100755
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from ipsilon.util.log import Log
 from ipsilon.util.user import UserSession
 from urllib import unquote
 import cherrypy
@@ -33,7 +34,7 @@ def admin_protect(fn):
     return check
 
 
-class Page(object):
+class Page(Log):
     def __init__(self, site, form=False):
         if 'template_env' not in site:
             raise ValueError('Missing template environment')
@@ -96,10 +97,6 @@ class Page(object):
         m.update(kwargs)
         return t.render(**m)
 
-    def _debug(self, fact):
-        if cherrypy.config.get('debug', False):
-            cherrypy.log(fact)
-
     def default(self, *args, **kwargs):
         raise cherrypy.HTTPError(404)
 
diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index 730ce6c..edfda16 100755
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -22,6 +22,7 @@ import imp
 import cherrypy
 import inspect
 from ipsilon.util.data import Store
+from ipsilon.util.log import Log
 
 
 class Plugins(object):
@@ -102,7 +103,7 @@ class PluginInstaller(object):
         return p.get_plugins(self._pathname, 'Installer')
 
 
-class PluginObject(object):
+class PluginObject(Log):
 
     def __init__(self):
         self.name = None
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 7c53526..84f1818 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipsilon.util.data import Store
+from ipsilon.util.log import Log
 import cherrypy
 
 
@@ -98,14 +99,10 @@ class User(object):
         raise AttributeError
 
 
-class UserSession(object):
+class UserSession(Log):
     def __init__(self):
         self.user = self.get_data('user', 'name')
 
-    def _debug(self, fact):
-        if cherrypy.config.get('debug', False):
-            cherrypy.log(fact)
-
     def get_user(self):
         return User(self.user)