merged and solve the conflits. All tests pass

wemake-services · Feb 25, 2020 · 14e8ce0 · 14e8ce0
1 parent 6d56f17
commit 14e8ce0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/tests/test_checker/test_noqa.py b/tests/test_checker/test_noqa.py
@@ -163,15 +163,8 @@
     'WPS354': 1,
     'WPS355': 1,
     'WPS356': 1,
-<<<<<<< HEAD
-<<<<<<< HEAD
     'WPS357': 0,  # logically unacceptable.
-=======
-    'WPS357': 1,
->>>>>>> test: added a test for violation WPS357. A raw string must contain the '\' character. If there is no '\' in the string a raw string should not be used.
-=======
-    'WPS357': 1,
->>>>>>> fix: repaired build a priori, issue #9
+    'WPS358': 1,
 
     'WPS400': 0,  # defined in ignored violations.
     'WPS401': 0,  # logically unacceptable.

diff --git a/...s/test_visitors/test_tokenize/test_primitives/test_string_tokens/test_string_multiline.py b/...s/test_visitors/test_tokenize/test_primitives/test_string_tokens/test_string_multiline.py
@@ -3,10 +3,10 @@
 import pytest
 
 from wemake_python_styleguide.violations.consistency import (
+    RawStringNotNeededViolation,
     WrongMultilineStringViolation,
 )
 from wemake_python_styleguide.visitors.tokenize.primitives import (
-    RawStringNotNeededViolation,
     WrongStringTokenVisitor,
 )
 

diff --git a/wemake_python_styleguide/violations/consistency.py b/wemake_python_styleguide/violations/consistency.py
@@ -2139,7 +2139,7 @@ class LineCompriseCarriageReturnViolation(TokenizeViolation):
     Solution:
         Use only ``\n`` (not ``\r\n`` or ``\r``) to break lines.
 
-    .. versionadded:: 0.15.0
+    .. versionadded:: 0.14.0
 
     """
 
@@ -2149,10 +2149,12 @@ class LineCompriseCarriageReturnViolation(TokenizeViolation):
 
 @final
 class RawStringNotNeededViolation(TokenizeViolation):
-    """
-    Summary here.
+    r"""
+    Forbid the use of raw strings when there is no backslash in the string.
+
     Reasoning:
         Raw string are only needed when dealing with \ in the string.
+
     Solution:
         Do not prefix the string with r. Use a normal string instead.
 
@@ -2162,9 +2164,9 @@ class RawStringNotNeededViolation(TokenizeViolation):
 
         # Wrong:
         r'This string should not be prefixed with r.'
-    Example::
-        Examples here.
+
     .. versionadded:: 0.15.0
+
     """
 
     error_template = 'Error template here'

diff --git a/wemake_python_styleguide/visitors/tokenize/primitives.py b/wemake_python_styleguide/visitors/tokenize/primitives.py
@@ -239,7 +239,7 @@ def _check_unnecessary_raw_string(self, token: tokenize.TokenInfo) -> None:
         if 'r' in modifiers.lower():
             if '\\' not in string_def:
                 self.add_violation(
-                    RawStringNotNeededViolation(token),
+                    consistency.RawStringNotNeededViolation(token),
                 )