Merge ssh://github.com/web2py/web2py

2013-07-05 23:12:16 +02:00
parent fa755a64d9 a7021bece2
commit 1940ec2eba
2 changed files with 6 additions and 3 deletions
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.03.17.15.42
+Version 2.6.0-development+timestamp.2013.07.05.02.12.46
@@ -6869,8 +6869,11 @@ class Row(object):

    def __getitem__(self, k):
        key=str(k)
-        if key in self.get('_extra',{}):
-            return self._extra[key]
+        _extra = self.__dict__.get('_extra', None)
+        if _extra is not None:
+            v = _extra.get(key, None)
+            if v:
+                return v
        m = REGEX_TABLE_DOT_FIELD.match(key)
        if m:
            try: