Merge pull request #897 from sobolevn/issue-768

Adds matmul operator support, fixes #768

Author: asottile

pycodestyle.py

@@ -113,7 +113,7 @@ def lru_cache(maxsize=128):  # noqa as it's a fake implementation.
 SINGLETONS = frozenset(['False', 'None', 'True'])
 KEYWORDS = frozenset(keyword.kwlist + ['print', 'async']) - SINGLETONS
 UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-'])
-ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-'])
+ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-', '@'])
 WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%'])
 # Warn for -> function annotation operator in py3.5+ (issue 803)
 FUNCTION_RETURN_ANNOTATION_OP = ['->'] if sys.version_info >= (3, 5) else []

testsuite/E22.py

@@ -84,6 +84,10 @@
 1is 1
 #: E225
 1in []
+#: E225
+i = 1 @2
+#: E225
+i = 1@ 2
 #: E225 E226
 i=i+1
 #: E225 E226
@@ -150,6 +154,7 @@ def halves(n):
     print >>sys.stderr, "x is out of range."
 print >> sys.stdout, "x is an integer."
 x = x / 2 - 1
+x = 1 @ 2
 
 if alpha[:-i]:
     *a, b = (1, 2, 3)