Drop usage of self._debug and use self.debug instead

This method was deprecated but still used in a lot of places.

https://fedorahosted.org/ipsilon/ticket/120

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>

4 files changed, 16 insertions, 16 deletions

diff --git a/ipsilon/util/endpoint.py b/ipsilon/util/endpoint.py
index 0016bc2..20d3694 100644
--- a/ipsilon/util/endpoint.py
+++ b/ipsilon/util/endpoint.py
@@ -70,20 +70,20 @@ class Endpoint(Log):
         if self.auth_protect and self.user.is_anonymous:
             raise cherrypy.HTTPError(401)
 
-        self._debug("method: %s" % cherrypy.request.method)
+        self.debug("method: %s" % cherrypy.request.method)
         op = getattr(self, cherrypy.request.method, None)
         if callable(op):
             # Basic CSRF protection
             if cherrypy.request.method != 'GET':
                 url = self.get_url()
                 if 'referer' not in cherrypy.request.headers:
-                    self._debug("Missing referer in %s request to %s"
-                                % (cherrypy.request.method, url))
+                    self.debug("Missing referer in %s request to %s"
+                               % (cherrypy.request.method, url))
                     raise cherrypy.HTTPError(403)
                 referer = cherrypy.request.headers['referer']
                 if not self._check_referer(referer, url):
-                    self._debug("Wrong referer %s in request to %s"
-                                % (referer, url))
+                    self.debug("Wrong referer %s in request to %s"
+                               % (referer, url))
                     raise cherrypy.HTTPError(403)
             return op(*args, **kwargs)
         else:
diff --git a/ipsilon/util/errors.py b/ipsilon/util/errors.py
index 26a6a34..7017a1b 100644
--- a/ipsilon/util/errors.py
+++ b/ipsilon/util/errors.py
@@ -31,7 +31,7 @@ class Errors(Page):
         return str(output_page)
 
     def handler(self, status, message, traceback, version):
-        self._debug(repr([status, message, traceback, version]))
+        self.debug(repr([status, message, traceback, version]))
         return self._error_template('internalerror.html',
                                     title='Internal Error')
 
diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index 21c9e3e..ec3828d 100644
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -85,20 +85,20 @@ class Page(Endpoint):
                 return op(*args[1:], **kwargs)
         else:
             if self._is_form_page:
-                self._debug("method: %s" % cherrypy.request.method)
+                self.debug("method: %s" % cherrypy.request.method)
                 op = getattr(self, cherrypy.request.method, None)
                 if callable(op):
                     # Basic CSRF protection
                     if cherrypy.request.method != 'GET':
                         url = self.get_url()
                         if 'referer' not in cherrypy.request.headers:
-                            self._debug("Missing referer in %s request to %s"
-                                        % (cherrypy.request.method, url))
+                            self.debug("Missing referer in %s request to %s"
+                                       % (cherrypy.request.method, url))
                             raise cherrypy.HTTPError(403)
                         referer = cherrypy.request.headers['referer']
                         if not self._check_referer(referer, url):
-                            self._debug("Wrong referer %s in request to %s"
-                                        % (referer, url))
+                            self.debug("Wrong referer %s in request to %s"
+                                       % (referer, url))
                             raise cherrypy.HTTPError(403)
                     return op(*args, **kwargs)
             else:
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 758bf3d..aaab947 100644
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -156,7 +156,7 @@ class UserSession(Log):
 
     def save_user_attrs(self, userattrs):
         cherrypy.session['userattrs'] = userattrs
-        self._debug('Saved user attrs')
+        self.debug('Saved user attrs')
         self.userattrs = userattrs
 
     def _get_provider_attr_name(self, provider):
@@ -172,14 +172,14 @@ class UserSession(Log):
     def save_provider_data(self, provider, data):
         attr = self._get_provider_attr_name(provider)
         cherrypy.session[attr] = data
-        self._debug('Saved %s provider data' % provider)
+        self.debug('Saved %s provider data' % provider)
 
     def save_data(self, facility, name, data):
         """ Save named data in the session so it can be retrieved later """
         if facility not in cherrypy.session:
             cherrypy.session[facility] = dict()
         cherrypy.session[facility][name] = data
-        self._debug('Saved session data named [%s:%s]' % (facility, name))
+        self.debug('Saved session data named [%s:%s]' % (facility, name))
 
     def get_data(self, facility, name):
         """ Get named data in the session if available """
@@ -197,7 +197,7 @@ class UserSession(Log):
                 return
             cherrypy.session[facility][name] = None
             del cherrypy.session[facility][name]
-            self._debug('Nuked session data named [%s:%s]' % (facility, name))
+            self.debug('Nuked session data named [%s:%s]' % (facility, name))
         else:
             del cherrypy.session[facility]
-            self._debug('Nuked session facility [%s]' % (facility,))
+            self.debug('Nuked session facility [%s]' % (facility,))