merge with GOBJECT_INTROSPECTION_1_37_6baserock/jonathan/fix-giscanner

1 files changed, 10 insertions, 8 deletions

diff --git a/giscanner/message.py b/giscanner/message.py
index 8a948cd3..3a330afe 100644
--- a/giscanner/message.py
+++ b/giscanner/message.py
@@ -61,7 +61,7 @@ class Position(object):
             return '%s:' % (filename, )
 
     def offset(self, offset):
-        return Position(self.filename, self.line+offset, self.column)
+        return Position(self.filename, self.line + offset, self.column)
 
 
 class MessageLogger(object):
@@ -119,16 +119,14 @@ If the warning is related to a ast.Node type, see log_node()."""
         elif log_type == FATAL:
             error_type = "Fatal"
         if prefix:
-            text = (
-'''%s: %s: %s: %s: %s\n''' % (last_position, error_type, self._namespace.name,
-                            prefix, text))
+            text = ('%s: %s: %s: %s: %s\n' % (last_position, error_type,
+                                              self._namespace.name, prefix, text))
         else:
             if self._namespace:
-                text = (
-'''%s: %s: %s: %s\n''' % (last_position, error_type, self._namespace.name, text))
+                text = ('%s: %s: %s: %s\n' % (last_position, error_type,
+                                              self._namespace.name, text))
             else:
-                text = (
-'''%s: %s: %s\n''' % (last_position, error_type, text))
+                text = ('%s: %s: %s\n' % (last_position, error_type, text))
 
         self._output.write(text)
         if log_type == FATAL:
@@ -169,17 +167,21 @@ def log_node(log_type, node, text, context=None, positions=None):
     ml = MessageLogger.get()
     ml.log_node(log_type, node, text, context=context, positions=positions)
 
+
 def warn(text, positions=None, prefix=None):
     ml = MessageLogger.get()
     ml.log(WARNING, text, positions, prefix)
 
+
 def warn_node(node, text, context=None, positions=None):
     log_node(WARNING, node, text, context=context, positions=positions)
 
+
 def warn_symbol(symbol, text):
     ml = MessageLogger.get()
     ml.log_symbol(WARNING, symbol, text)
 
+
 def fatal(text, positions=None, prefix=None):
     ml = MessageLogger.get()
     ml.log(FATAL, text, positions, prefix)