Hack to let x[0][0] return a scalar for matrices.

1 files changed, 8 insertions, 1 deletions

diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py
index de37a2686..77e90acbd 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/core/defmatrix.py
@@ -224,6 +224,14 @@ class matrix(N.ndarray):
 
     def __getitem__(self, index):
         self._getitem = True
+
+        # If indexing by scalar, check whether we are indexing into
+        # a vector, and then return the corresponding element
+        if N.isscalar(index) and (1 in self.shape):
+            index = [index,index]
+            index[list(self.shape).index(1)] = 0
+            index = tuple(index)
+
         try:
             out = N.ndarray.__getitem__(self, index)
         finally:
@@ -254,7 +262,6 @@ class matrix(N.ndarray):
             if (val > 1): truend += 1
         return truend
 
-
     def __mul__(self, other):
         if isinstance(other,(N.ndarray, list, tuple)) :
             # This promotes 1-D vectors to row vectors