From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 7 Aug 2014 05:50:30 +0000 (-0700)
Subject: add matrix multiplication operator to correct lists (closes #22142)
X-Git-Tag: v3.5.0a1~1103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd592417f436be0dfdfda3248ec469c1f8c20dff;p=thirdparty%2FPython%2Fcpython.git

add matrix multiplication operator to correct lists (closes #22142)
---

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 6617c3b45519..699d91603533 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -689,7 +689,7 @@ Operators
 
 The following tokens are operators::
 
-   +       -       *       **      /       //      %
+   +       -       *       **      /       //      %      @
    <<      >>      &       |       ^       ~
    <       >       <=      >=      ==      !=
 
@@ -705,7 +705,7 @@ The following tokens serve as delimiters in the grammar::
 
    (       )       [       ]       {       }
    ,       :       .       ;       @       =       ->
-   +=      -=      *=      /=      //=     %=
+   +=      -=      *=      /=      //=     %=      @=
    &=      |=      ^=      >>=     <<=     **=
 
 The period can also occur in floating-point and imaginary literals.  A sequence