Use logging instead of logger

13 files changed, 32 insertions, 58 deletions

diff --git a/activity.py b/activity.py
index 94a45ab..040b888 100644
--- a/activity.py
+++ b/activity.py
@@ -20,7 +20,6 @@ import locale
 locale.setlocale(locale.LC_NUMERIC, 'C')
 
 import logging
-_logger = logging.getLogger('memorize-activity')
 
 from gettext import gettext as _
 import os
@@ -220,11 +219,11 @@ class MemorizeActivity(Activity):
                 # We've already joined
                 self._joined_cb(self)
         elif not self._jobject.file_path:
-            _logger.debug('buddy joined - __init__: %s', self.owner.props.nick)
+            logging.debug('buddy joined - __init__: %s', self.owner.props.nick)
             game_file = os.path.join(os.path.dirname(__file__), 'demos',
                                      'addition.zip')
             self.game.load_game(game_file, 4, 'demo')
-            _logger.debug('loading conventional')
+            logging.debug('loading conventional')
             self.game.add_buddy(self.owner)
         else:
             self.game.add_buddy(self.owner)
@@ -368,7 +367,7 @@ class MemorizeActivity(Activity):
 
     def change_game(self, widget, game_name, size, mode,
                     title=None, color=None):
-        _logger.debug('Change game %s', game_name)
+        logging.debug('Change game %s', game_name)
         self.game.change_game(widget, game_name, size, mode, title, color)
         self.cardlist.game_loaded = False
 
@@ -377,17 +376,17 @@ class MemorizeActivity(Activity):
         self.createcardpanel.change_equal_pairs(widget, state)
 
     def _shared_cb(self, activity):
-        _logger.debug('My activity was shared')
+        logging.debug('My activity was shared')
         self.initiating = True
         self._sharing_setup()
 
-        _logger.debug('This is my activity: making a tube...')
+        logging.debug('This is my activity: making a tube...')
         self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
             SERVICE, {})
 
     def _sharing_setup(self):
         if self.get_shared_activity() is None:
-            _logger.error('Failed to share or join activity')
+            logging.error('Failed to share or join activity')
             return
         shared_activity = self.get_shared_activity()
         self.conn = shared_activity.telepathy_conn
@@ -405,17 +404,17 @@ class MemorizeActivity(Activity):
             self._new_tube_cb(*tube_info)
 
     def _list_tubes_error_cb(self, e):
-        _logger.error('ListTubes() failed: %s', e)
+        logging.error('ListTubes() failed: %s', e)
 
     def _joined_cb(self, activity):
         if not self.get_shared_activity():
             return
 
-        _logger.debug('Joined an existing shared activity')
+        logging.debug('Joined an existing shared activity')
 
         for buddy in self.get_shared_activity().get_joined_buddies():
             if buddy != self.owner:
-                _logger.debug("buddy joined - _joined_cb: %s  "
+                logging.debug("buddy joined - _joined_cb: %s  "
                               "(get buddies and add them to my list)",
                               buddy.props.nick)
                 self.game.add_buddy(buddy)
@@ -424,14 +423,14 @@ class MemorizeActivity(Activity):
         self.initiating = False
         self._sharing_setup()
 
-        _logger.debug('This is not my activity: waiting for a tube...')
+        logging.debug('This is not my activity: waiting for a tube...')
         self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes(
             reply_handler=self._list_tubes_reply_cb,
             error_handler=self._list_tubes_error_cb)
 
     def _new_tube_cb(self, identifier, initiator, tube_type, service,
                      params, state):
-        _logger.debug('New tube: ID=%d initator=%d type=%d service=%s '
+        logging.debug('New tube: ID=%d initator=%d type=%d service=%s '
                       'params=%r state=%d', identifier, initiator, tube_type,
                       service, params, state)
 
@@ -467,18 +466,18 @@ class MemorizeActivity(Activity):
     def _buddy_joined_cb(self, activity, buddy):
         if buddy != self.owner:
             if buddy.props.nick == '':
-                _logger.debug("buddy joined: empty nick=%s. Will not add.",
+                logging.debug("buddy joined: empty nick=%s. Will not add.",
                               buddy.props.nick)
             else:
-                _logger.debug("buddy joined: %s", buddy.props.nick)
+                logging.debug("buddy joined: %s", buddy.props.nick)
                 self.game.add_buddy(buddy)
 
     def _buddy_left_cb(self, activity, buddy):
         if buddy.props.nick == '':
-            _logger.debug("buddy joined: empty nick=%s. Will not remove",
+            logging.debug("buddy joined: empty nick=%s. Will not remove",
                           buddy.props.nick)
         else:
-            _logger.debug("buddy left: %s", buddy.props.nick)
+            logging.debug("buddy left: %s", buddy.props.nick)
             self.game.rem_buddy(buddy)
 
     def _focus_in(self, event, data=None):
diff --git a/audio.py b/audio.py
index fcd645e..969f8e2 100644
--- a/audio.py
+++ b/audio.py
@@ -21,8 +21,6 @@ from gi.repository import GObject
 
 import logging
 
-_logger = logging.getLogger('memorize-activity')
-
 Gst.init([])
 
 
@@ -44,20 +42,20 @@ class Audio(GObject.GObject):
 
     def play(self, filename=None):
         if filename:
-            _logger.debug('play audio %s' % filename)
+            logging.debug('play audio %s' % filename)
             self._player.set_state(Gst.State.NULL)
             self._player.set_property('uri', 'file://' + filename)
         elif self._playing is None:
             return
         else:
-            _logger.debug('continue audio')
+            logging.debug('continue audio')
 
         self._player.set_state(Gst.State.PLAYING)
         self._playing = True
 
     def pause(self):
         if self._playing is not None:
-            _logger.debug('pause audio')
+            logging.debug('pause audio')
             self._player.set_state(Gst.State.PAUSED)
             self._playing = False
 
@@ -70,5 +68,5 @@ class Audio(GObject.GObject):
         if message_type in (Gst.MessageType.EOS, Gst.MessageType.ERROR):
             self._player.set_state(Gst.State.NULL)
             self._playing = None
-            _logger.debug('audio stoped with type %d' % message_type)
+            logging.debug('audio stoped with type %d' % message_type)
             self.emit('play_finished')
diff --git a/cardlist.py b/cardlist.py
index 1e5308a..6d50722 100644
--- a/cardlist.py
+++ b/cardlist.py
@@ -30,7 +30,6 @@ from model import Pair
 from sugar3.graphics import style
 from sugar3 import profile
 
-_logger = logging.getLogger('memorize-activity')
 PAIR_SIZE = min(Gdk.Screen.width() / 7, Gdk.Screen.height() / 5)
 user_color = profile.get_color()
 
diff --git a/cardtable.py b/cardtable.py
index 34cf867..ccd6baf 100644
--- a/cardtable.py
+++ b/cardtable.py
@@ -26,9 +26,7 @@ import svgcard
 import os
 import math
 
-
 import logging
-_logger = logging.getLogger('memorize-activity')
 
 CARD_PAD = style.zoom(6)
 
@@ -75,7 +73,7 @@ class CardTable(Gtk.EventBox):
         self.show_all()
 
     def resize(self, width, height, change=True):
-        _logger.debug('set size request %dx%d' % (width, height))
+        logging.debug('set size request %dx%d' % (width, height))
         self.set_size_request(width, height)
         self._workspace_size = min(width, height)
         if self.data:
diff --git a/createcardpanel.py b/createcardpanel.py
index 2a307e8..fd21e6b 100644
--- a/createcardpanel.py
+++ b/createcardpanel.py
@@ -42,7 +42,6 @@ import speak.espeak
 import speak.widgets
 import speak.face
 
-_logger = logging.getLogger('memorize-activity')
 PAIR_SIZE = min(Gdk.Screen.width() / 4, Gdk.Screen.height() / 3)
 
 
@@ -428,7 +427,7 @@ class CardEditor(Gtk.EventBox):
                                pixbuf_t.get_height(), 0, 0, 1, 1,
                                GdkPixbuf.InterpType.BILINEAR, 255)
             self.card.set_pixbuf(pixbuf_z)
-            _logger.debug('Picture Loaded: ' + index)
+            logging.debug('Picture Loaded: ' + index)
             self.emit('has-picture', True)
             del pixbuf_t
             del pixbuf_z
@@ -451,7 +450,7 @@ class CardEditor(Gtk.EventBox):
                                             style.XLARGE_ICON_SIZE, 0)
             self.card.set_pixbuf(pixbuf_t)
             self.emit('has-sound', True)
-            _logger.debug('Audio Loaded: ' + dst)
+            logging.debug('Audio Loaded: ' + dst)
 
         chooser.pick(parent=self.get_toplevel(),
                      what=chooser.AUDIO,
diff --git a/face.py b/face.py
index a182929..2e63a4c 100644
--- a/face.py
+++ b/face.py
@@ -16,7 +16,6 @@ from gi.repository import Gtk
 from gi.repository import Gdk
 
 import logging
-_logger = logging.getLogger('memorize-activity')
 
 from sugar3.graphics import style
 
@@ -68,7 +67,7 @@ def acquire():
     if not face:
         face = Face()
         _cache.append(face)
-        _logger.debug('face._cache size %s' % len(_cache))
+        logging.debug('face._cache size %s' % len(_cache))
 
     return face
 
diff --git a/game.py b/game.py
index d32deb5..3789f88 100644
--- a/game.py
+++ b/game.py
@@ -24,8 +24,6 @@ from gettext import gettext as _
 from model import Model
 from audio import Audio
 
-_logger = logging.getLogger('memorize-activity')
-
 SERVICE = 'org.laptop.Memorize'
 IFACE = SERVICE
 PATH = '/org/laptop/Memorize'
@@ -134,7 +132,7 @@ class MemorizeGame(GObject.GObject):
             self.model.is_demo = (mode == 'demo')
 
     def add_buddy(self, buddy, score=0):
-        _logger.debug('Buddy %r was added to game', buddy.props.nick)
+        logging.debug('Buddy %r was added to game', buddy.props.nick)
         self.players.append(buddy)
         self.players.sort(lambda a, b: cmp(a.props.nick, b.props.nick))
         self.players_score[buddy] = score
@@ -146,7 +144,7 @@ class MemorizeGame(GObject.GObject):
             self.change_turn()
 
     def rem_buddy(self, buddy):
-        _logger.debug('Buddy %r was removed from game', buddy.props.nick)
+        logging.debug('Buddy %r was removed from game', buddy.props.nick)
         if self.current_player == buddy and len(self.players) >= 2:
             if self.last_flipped != -1:
                 self.emit('flop-card', self.last_flipped)
diff --git a/memorizetoolbar.py b/memorizetoolbar.py
index c929c89..2512db6 100644
--- a/memorizetoolbar.py
+++ b/memorizetoolbar.py
@@ -31,9 +31,6 @@ from sugar3.graphics.menuitem import MenuItem
 from model import USE_ART4APPS, art4apps_data
 
 
-_logger = logging.getLogger('memorize-activity')
-
-
 class MemorizeToolbarBuilder(GObject.GObject):
 
     __gtype_name__ = 'MemoryToolbarBuilder'
diff --git a/messenger.py b/messenger.py
index bddc73e..96d800b 100644
--- a/messenger.py
+++ b/messenger.py
@@ -15,9 +15,6 @@
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import logging
-_logger = logging.getLogger('memorize-activity')
-
 import tempfile
 from os import environ, chmod
 from os.path import join, getsize, dirname, basename
diff --git a/model.py b/model.py
index b80f1d0..5323fac 100644
--- a/model.py
+++ b/model.py
@@ -41,8 +41,6 @@ except ImportError:
     pass
 
 
-_logger = logging.getLogger('model')
-
 DEFAULT_FONT = 'Sans'
 
 
@@ -128,7 +126,7 @@ class Model(object):
         if isdir(game_path):
             self.game_path = game_path
         else:
-            _logger.error('Game_path not found in %s' % game_path)
+            logging.error('Game_path not found in %s' % game_path)
             return
 
         self.data['face'] = ''
@@ -237,11 +235,11 @@ class Model(object):
                     idpair += 1
 
             else:
-                _logger.error('Read: Error in validation of the file')
+                logging.error('Read: Error in validation of the file')
                 return 1
             return 0
         except Exception as e:
-            _logger.error('Read: Error parsing file ' + str(e))
+            logging.error('Read: Error parsing file ' + str(e))
             return 2
 
     def read_art4apps(self, category, language):
@@ -370,7 +368,7 @@ class Model(object):
         place
         '''
         psize = (size * size / 2)
-        _logger.debug('Size requested: %d', psize)
+        logging.debug('Size requested: %d', psize)
         self.grid = []
         temp1 = []
         temp2 = []
@@ -416,7 +414,7 @@ class Model(object):
 
         numpairs = len(self.pairs)
         if numpairs < psize:
-            _logger.debug('Defgrid: Not enough pairs, requested=%s had=%s'
+            logging.debug('Defgrid: Not enough pairs, requested=%s had=%s'
                           % (psize, numpairs))
         self.data['size'] = str(size)
 
@@ -428,9 +426,9 @@ class Model(object):
             temp1.extend(temp2)
             random.shuffle(temp1)
         self.grid = temp1
-        _logger.debug('Defgrid: grid( size=%s ): %s'
+        logging.debug('Defgrid: grid( size=%s ): %s'
                       % (self.data['size'], self.grid))
-        _logger.debug('Defgrid: data: %s', self.data)
+        logging.debug('Defgrid: data: %s', self.data)
 
     def set_data_grid(self, data, grid):
         self.data = data
diff --git a/playerscoreboard.py b/playerscoreboard.py
index b7191f0..81b4bc3 100644
--- a/playerscoreboard.py
+++ b/playerscoreboard.py
@@ -24,8 +24,6 @@ from sugar3.graphics import style
 import logging
 import math
 
-_logger = logging.getLogger('memorize-activity')
-
 
 class PlayerScoreboard(Gtk.EventBox):
 
diff --git a/scoreboard.py b/scoreboard.py
index 0117ff8..f381378 100644
--- a/scoreboard.py
+++ b/scoreboard.py
@@ -15,15 +15,11 @@
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import logging
-
 from gi.repository import Gtk
 from gi.repository import Gdk
 
 from playerscoreboard import PlayerScoreboard
 
-_logger = logging.getLogger('memorize-activity')
-
 
 class Scoreboard(Gtk.EventBox):
     def __init__(self):
diff --git a/svgcard.py b/svgcard.py
index fc617b7..fde06ed 100644
--- a/svgcard.py
+++ b/svgcard.py
@@ -35,8 +35,6 @@ import face
 import speak.voice
 import model
 
-_logger = logging.getLogger('memorize-activity')
-
 BORDER_WIDTH = style.zoom(10)