pylint

2 files changed, 7 insertions, 7 deletions

diff --git a/src/sugar/logger.py b/src/sugar/logger.py
index 75119de..4703fc3 100644
--- a/src/sugar/logger.py
+++ b/src/sugar/logger.py
@@ -18,7 +18,6 @@
 import sys
 import os
 import logging
-import time
 
 # Let's keep this self contained so that it can be easily
 # pasted in external sugar service like the datastore.
@@ -37,7 +36,7 @@ def set_level(level):
     if levels.has_key(level):
         logging.getLogger('').setLevel(levels[level])
 
-def _except_hook(type, value, traceback):
+def _except_hook(exctype, value, traceback):
     # Attempt to provide verbose IPython tracebacks.
     # Importing IPython is slow, so we import it lazily.
     try:
@@ -46,7 +45,7 @@ def _except_hook(type, value, traceback):
     except ImportError:
         sys.excepthook = sys.__excepthook__
 
-    sys.excepthook(type, value, traceback)
+    sys.excepthook(exctype, value, traceback)
         
 def start(log_filename=None):
     logging.basicConfig(level=logging.WARNING,
diff --git a/src/sugar/mime.py b/src/sugar/mime.py
index a7b3eea..11a549e 100644
--- a/src/sugar/mime.py
+++ b/src/sugar/mime.py
@@ -170,7 +170,8 @@ def choose_most_significant(mime_types):
     for mime_category in ['image/', 'application/']:
         for mime_type in mime_types:
 
-            if mime_type.startswith(mime_category) and mime_type not in _black_list:
+            if mime_type.startswith(mime_category) and \
+               mime_type not in _black_list:
                 # skip mozilla private types (second component starts with '_'
                 # or ends with '-priv') 
                 if mime_type.split('/')[1].startswith('_') or \
@@ -212,10 +213,10 @@ def _file_looks_like_text(file_name):
 
     for encoding in ('ascii', 'latin_1', 'utf_8', 'utf_16'):
         try:
-            string = unicode(sample, encoding)
+            unicode(sample, encoding)
             return True
-        except Exception, e:
-            pass
+        except Exception:
+            return False
 
     return False