Merge remote-tracking branch 'upstream/master'

Author: Nurdok

docs/conf.py

@@ -56,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.1'
+version = '0.5.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.1'
+release = '0.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pep257.py

@@ -49,6 +49,14 @@ def next(obj, default=nothing):
                 return default
 
 
+# If possible (python >= 3.2) use tokenize.open to open files, so PEP 263
+# encoding markers are interpreted.
+try:
+    tokenize_open = tk.open
+except AttributeError:
+    tokenize_open = open
+
+
 __version__ = '0.5.0'
 __all__ = ('check', 'collect')
 
@@ -671,7 +679,7 @@ def check(filenames, ignore=()):
     for filename in filenames:
         log.info('Checking file %s.', filename)
         try:
-            with open(filename) as file:
+            with tokenize_open(filename) as file:
                 source = file.read()
             for error in PEP257Checker().check_source(source, filename):
                 code = getattr(error, 'code', None)
@@ -988,11 +996,12 @@ def check_triple_double_quotes(self, definition, docstring):
 
         '''
         if docstring and '"""' in eval(docstring) and docstring.startswith(
-                ("'''", "r'''", "u'''")):
+                ("'''", "r'''", "u'''", "ur'''")):
             # Allow ''' quotes if docstring contains """, because otherwise """
             # quotes could not be expressed inside docstring.  Not in PEP 257.
             return
-        if docstring and not docstring.startswith(('"""', 'r"""', 'u"""')):
+        if docstring and not docstring.startswith(
+                ('"""', 'r"""', 'u"""', 'ur"""')):
             quotes = "'''" if "'''" in docstring[:4] else "'"
             return D300(quotes)
 
@@ -1006,7 +1015,8 @@ def check_backslashes(self, definition, docstring):
         '''
         # Just check that docstring is raw, check_triple_double_quotes
         # ensures the correct quotes.
-        if docstring and '\\' in docstring and not docstring.startswith('r'):
+        if docstring and '\\' in docstring and not docstring.startswith(
+                ('r', 'ur')):
             return D301()
 
     @check_for(Definition)
@@ -1019,7 +1029,8 @@ def check_unicode_docstring(self, definition, docstring):
         # Just check that docstring is unicode, check_triple_double_quotes
         # ensures the correct quotes.
         if docstring and sys.version_info[0] <= 2:
-            if not is_ascii(docstring) and not docstring.startswith('u'):
+            if not is_ascii(docstring) and not docstring.startswith(
+                    ('u', 'ur')):
                 return D302()
 
     @check_for(Definition)

test_pep257.py

@@ -4,6 +4,7 @@
 
 from __future__ import with_statement
 
+import sys
 import os
 import mock
 import shutil
@@ -82,7 +83,7 @@ def test_ignore_list():
     expected_error_codes = set(('D100', 'D400', 'D401', 'D205', 'D209',
                                 'D210'))
     mock_open = mock.mock_open(read_data=function_to_check)
-    with mock.patch('pep257.open', mock_open, create=True):
+    with mock.patch('pep257.tokenize_open', mock_open, create=True):
         errors = tuple(pep257.check(['filepath']))
         error_codes = set(error.code for error in errors)
         assert error_codes == expected_error_codes
@@ -144,3 +145,27 @@ def foo():
 
         out, err = env.invoke_pep257(args='--count')
         assert '2' in out
+
+
+def test_unicode_raw():
+    """Test acceptance of unicode raw docstrings for python 2.x."""
+    if sys.version_info[0] >= 3:
+        return  # ur"" is a syntax error in python 3.x
+
+    # This is all to avoid a syntax error for python 3.2
+    from codecs import unicode_escape_decode
+
+    def u(x):
+        return unicode_escape_decode(x)[0]
+
+    with Pep257Env() as env:
+        with env.open('example.py', 'wt') as example:
+            example.write(textwrap.dedent(u('''\
+                # -*- coding: utf-8 -*-
+                def foo():
+                    ur"""Check unicode: \u2611 and raw: \\\\\\\\."""
+            ''').encode('utf-8')))
+        env.write_config(ignore='D100', verbose=True)
+        out, err = env.invoke_pep257()
+        assert 'D301' not in err
+        assert 'D302' not in err

tox.ini

@@ -7,6 +7,8 @@
 envlist = py26, py27, py32, py33, py34, pypy, pypy3
 
 [testenv]
+# Make sure reading the UTF-8 from test.py works regardless of the locale used.
+setenv = LANG=C LC_ALL=C
 commands = py.test --pep8 --clearcache
 deps = pytest
        pytest-pep8