Linting fixes

enlighten/_counter.py

@@ -18,7 +18,7 @@
 import time
 
 from enlighten._basecounter import BaseCounter, PrintableCounter
-from enlighten._util import EnlightenWarning, format_time, warn_best_level
+from enlighten._util import EnlightenWarning, format_time, raise_from_none, warn_best_level
 
 COUNTER_FMT = u'{desc}{desc_pad}{count:d} {unit}{unit_pad}' + \
               u'[{elapsed}, {rate:.2f}{unit_pad}{unit}/s]{fill}'
@@ -578,7 +578,7 @@ def format(self, width=None, elapsed=None):
             try:
                 rtn = self.bar_format.format(**fields)
             except KeyError as e:
-                raise ValueError('%r specified in format, but not provided' % e.args[0])
+                raise_from_none(ValueError('%r specified in format, but not provided' % e.args[0]))
 
             # Format the bar
             if self.offset is None:
@@ -618,7 +618,7 @@ def format(self, width=None, elapsed=None):
         try:
             rtn = self.counter_format.format(**fields)
         except KeyError as e:
-            raise ValueError('%r specified in format, but not provided' % e.args[0])
+            raise_from_none(ValueError('%r specified in format, but not provided' % e.args[0]))
 
         return self._fill_text(rtn, width, offset=self.offset)
 

enlighten/_statusbar.py

@@ -14,7 +14,7 @@
 import time
 
 from enlighten._basecounter import PrintableCounter
-from enlighten._util import EnlightenWarning, format_time, Justify, warn_best_level
+from enlighten._util import EnlightenWarning, format_time, Justify, raise_from_none, warn_best_level
 
 
 STATUS_FIELDS = {'elapsed', 'fill'}
@@ -205,7 +205,7 @@ def format(self, width=None, elapsed=None):
             try:
                 rtn = self.status_format.format(**fields)
             except KeyError as e:
-                raise ValueError('%r specified in format, but not provided' % e.args[0])
+                raise_from_none(ValueError('%r specified in format, but not provided' % e.args[0]))
 
         rtn = self._fill_text(rtn, width)
 

enlighten/_util.py

@@ -14,6 +14,7 @@
 
 import inspect
 import os
+import sys
 import warnings
 
 try:
@@ -69,6 +70,17 @@ def format_time(seconds):
     return rtn
 
 
+def raise_from_none(exc):  # pragma: no cover
+    """
+    Convenience function to raise from None in a Python 2/3 compatible manner
+    """
+    raise exc
+
+
+if sys.version_info[0] >= 3:  # pragma: no branch
+    exec('def raise_from_none(exc):\n    raise exc from None')  # pylint: disable=exec-used
+
+
 class Justify(object):
     """
     Enumerated type for justification options

examples/demo.py

@@ -14,6 +14,7 @@
 
 import enlighten
 
+# pylint: disable=wrong-import-order
 from multicolored import run_tests, load
 from multiple_logging import process_files, win_time_granularity
 

pylintrc

@@ -21,8 +21,9 @@ good-names=e,_
 
 [MESSAGES CONTROL]
 disable=
+    super-with-arguments,  # Python 2
     too-few-public-methods,
-    useless-object-inheritance
+    useless-object-inheritance,  # Python 2
 
 [SIMILARITIES]
 # Minimum lines number of a similarity.