Fix iteration

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>

.editorconfig

@@ -0,0 +1,10 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

fiximports/fiximports.py

@@ -11,6 +11,7 @@
 import argparse
 import re
 import sys
+import six
 
 
 class FixImports(object):
@@ -105,11 +106,17 @@ def maybeEndGroup():
                 self.group_start = None
 
         if splitImportStatements:
-            for line in lines:
+            iter = six.next(lines)
+            while True:
+                line = line.strip()
+                try:
+                    line = six.next()
+                except StopIteration:
+                    break
                 if self.isImportLine(line):
                     # join any continuation lines (\\)
                     while line[-1] == '\\':
-                        line = line[:-1] + iter.__next__()
+                        line = line[:-1] + six.next()
                     if self.group_start is None:
                         self.group_start = len(newlines)
 
@@ -119,7 +126,7 @@ def maybeEndGroup():
                             module = match.group(1)
                             imports = [s.strip() for s in match.group(2).split(",")]
                             for imp in imports:
-                                newlines.append("from %s import %s" % (module, imp))
+                                newlines.append("from {} import {}".format(module, imp))
                             continue
                 else:
                     maybeEndGroup()

requirements.txt

@@ -1,3 +1,4 @@
 setuptools>=17.1
 pip>=1.0
 argparse; python_version=='2.6'
+six>=1.10.0