Fix build for Python versions other than 2.7

Author: Vladimir Keleshev

pep257.py

@@ -11,6 +11,8 @@
 http://github.com/GreenSteam/pep257
 
 """
+from __future__ import with_statement
+
 import os
 import sys
 import tokenize as tk
@@ -28,8 +30,16 @@
 try:
     next
 except NameError:  # Python 2.5 and earlier
-    def next(obj):
-        return obj.next()
+    nothing = object()
+
+    def next(obj, default=nothing):
+        if default == nothing:
+            return obj.next()
+        else:
+            try:
+                return obj.next()
+            except StopIteration:
+                return default
 
 
 __version__ = '0.3.0'
@@ -491,8 +501,8 @@ def check_no_blank_before(self, function, docstring):  # def
         # NOTE: This does not take into account functions with groups of code.
         if docstring:
             before, _, after = function.source.partition(docstring)
-            blanks_before = map(is_blank, before.split('\n')[:-1])
-            blanks_after = map(is_blank, after.split('\n')[1:])
+            blanks_before = list(map(is_blank, before.split('\n')[:-1]))
+            blanks_after = list(map(is_blank, after.split('\n')[1:]))
             blanks_before_count = sum(takewhile(bool, reversed(blanks_before)))
             blanks_after_count = sum(takewhile(bool, blanks_after))
             if blanks_before_count != 0:
@@ -526,8 +536,8 @@ def check_blank_before_after_class(slef, class_, docstring):
         # def foo(): pass
         if docstring:
             before, _, after = class_.source.partition(docstring)
-            blanks_before = map(is_blank, before.split('\n')[:-1])
-            blanks_after = map(is_blank, after.split('\n')[1:])
+            blanks_before = list(map(is_blank, before.split('\n')[:-1]))
+            blanks_after = list(map(is_blank, after.split('\n')[1:]))
             blanks_before_count = sum(takewhile(bool, reversed(blanks_before)))
             blanks_after_count = sum(takewhile(bool, blanks_after))
             if blanks_before_count != 1:

test.py

@@ -1,20 +1,26 @@
 """Docstring."""
 # encoding: utf-8
-errors = set([])
+import sys
+
+
+expected = set([])
 
 
 def expect(*args):
     """Decorator that expects a certain PEP 257 violation."""
-    ignore = lambda a: None
+    none = lambda a: None
     if len(args) == 1:
-        return lambda f: errors.add((f.__name__, args[0])) or ignore(f()) or f
-    errors.add(args)
+        return lambda f: expected.add((f.__name__, args[0])) or none(f()) or f
+    expected.add(args)
+
+
+expect('class_', 'D101: Docstring missing')
 
 
-@expect('D101: Docstring missing')
 class class_:
 
-    @expect('D101: Docstring missing')
+    expect('meta', 'D101: Docstring missing')
+
     class meta:
         """"""
 
@@ -70,20 +76,30 @@ def trailing_and_leading_space():
     pass
 
 
-@expect('D203: Expected 1 blank line *before* class docstring, found 0')
+expect('LeadingSpaceMissing',
+       'D203: Expected 1 blank line *before* class docstring, found 0')
+
+
 class LeadingSpaceMissing:
     """Leading space missing."""
 
 
-@expect('D204: Expected 1 blank line *after* class docstring, found 0')
+expect('TrailingSpace',
+       'D204: Expected 1 blank line *after* class docstring, found 0')
+
+
 class TrailingSpace:
 
     """TrailingSpace."""
     pass
 
 
-@expect('D203: Expected 1 blank line *before* class docstring, found 0')
-@expect('D204: Expected 1 blank line *after* class docstring, found 0')
+expect('LeadingAndTrailingSpaceMissing',
+       'D203: Expected 1 blank line *before* class docstring, found 0')
+expect('LeadingAndTrailingSpaceMissing',
+       'D204: Expected 1 blank line *after* class docstring, found 0')
+
+
 class LeadingAndTrailingSpaceMissing:
     """Leading and trailing space missing."""
     pass
@@ -182,9 +198,10 @@ def lalsksdewnlkjl():
     """Sum\\mary."""
 
 
-@expect('D302: Use u""" for docstrings with Unicode')
-def lasewnlkjl():
-    """Юникод."""
+if sys.version_info[0] <= 2:
+    @expect('D302: Use u""" for docstrings with Unicode')
+    def lasewnlkjl():
+        """Юникод."""
 
 
 @expect("D400: First line should end with '.', not 'y'")
@@ -208,6 +225,6 @@ def run():
     results = list(pep257.check([__file__]))
     assert set(map(type, results)) == set([pep257.Error]), results
     results = set([(e.definition.name, e.message) for e in results])
-    print('\nmissing: %r' % (results - errors))
-    print('\n  extra: %r' % (errors - results))
-    assert errors == results
+    print('\n  extra: %r' % (results - expected))
+    print('\nmissing: %r' % (expected - results))
+    assert expected == results