Added __pow__(a,b) to the operator module. Completes the pattern of

all operators having a counterpart in the operator module.

Closes SF bug #577513.

diff --git a/Doc/lib/liboperator.tex b/Doc/lib/liboperator.tex
index 7d34a0f2b9428db9b15a68f5ca2ec0ced27ea550..84450a4426b588af92f952207e490771d777ee19 100644 (file)
--- a/Doc/lib/liboperator.tex
+++ b/Doc/lib/liboperator.tex
@@ -131,6 +131,11 @@ Return the bitwise or of \var{a} and \var{b}.
 Return \var{o} positive.
 \end{funcdesc}
 
+\begin{funcdesc}{pow}{a, b}
+\funcline{__pow__}{a, b}
+Return \var{a} \code{**} \var{b}, for \var{a} and \var{b} numbers.
+\end{funcdesc}
+
 \begin{funcdesc}{rshift}{a, b}
 \funcline{__rshift__}{a, b}
 Return \var{a} shifted right by \var{b}.
@@ -310,6 +315,8 @@ symbols in the Python syntax and the functions in the
           {\code{invert(\var{a})}}
   \lineiii{Bitwise Or}{\code{\var{a} | \var{b}}}
           {\code{or_(\var{a}, \var{b})}}
+  \lineiii{Exponentiation}{\code{\var{a} ** \var{b}}}
+          {\code{pow(\var{a}, \var{b})}}
   \lineiii{Indexed Assignment}{\code{\var{o}[\var{k}] = \var{v}}}
           {\code{setitem(\var{o}, \var{k}, \var{v})}}
   \lineiii{Indexed Deletion}{\code{del \var{o}[\var{k}]}}

diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
index f1e295954562d1235ecf9a846de53ad2be04181a..611e4277ff396a461bfac3b0eccc3dc0474322a5 100644 (file)
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -161,6 +161,12 @@ class OperatorTestCase(unittest.TestCase):
         self.failUnless(operator.pos(0) == 0)
         self.failUnless(operator.pos(-0) == 0)
 
+    def test_pow(self):
+        self.failUnless(operator.pow(3,5) == 3**5)
+        self.failUnless(operator.__pow__(3,5) == 3**5)
+        self.assertRaises(TypeError, operator.pow, 1)
+        self.assertRaises(TypeError, operator.pow, 1, 2, 3)
+
     def test_repeat(self):
         a = range(3)
         self.failUnless(operator.repeat(a, 2) == a+a)

diff --git a/Modules/operator.c b/Modules/operator.c
index 229fbac1014b4f4960d979e0678c7276219a9a66..55c26df151291c4b173fe65357b0b0c3f1ad2b4d 100644 (file)
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -101,6 +101,15 @@ spamrc(op_ne           , Py_NE)
 spamrc(op_gt           , Py_GT)
 spamrc(op_ge           , Py_GE)
 
+static PyObject*
+op_pow(PyObject *s, PyObject *a)
+{
+       PyObject *a1, *a2;
+       if (PyArg_ParseTuple(a,"OO:pow",&a1,&a2))
+               return PyNumber_Power(a1, a2, Py_None);
+       return NULL;
+}
+
 static PyObject*
 op_getslice(PyObject *s, PyObject *a)
 {
@@ -199,6 +208,7 @@ spam2(setitem,__setitem__,
  "setitem(a, b, c) -- Same as a[b] = c.")
 spam2(delitem,__delitem__,
  "delitem(a, b) -- Same as del a[b].")
+spam2(pow,__pow__, "pow(a, b) -- Same as a**b.")
 spam2(getslice,__getslice__,
  "getslice(a, b, c) -- Same as a[b:c].")
 spam2(setslice,__setslice__,