R-2.0.8

Makefile

@@ -29,7 +29,7 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.0.7 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
+	echo 'Version 2.0.8 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps

VERSION

@@ -1 +1 @@
-Version 2.0.7 (2012-09-04 17:58:46) stable
+Version 2.0.8 (2012-09-06 21:32:40) stable

applications/admin/controllers/default.py

@@ -137,7 +137,7 @@ def check_version():
     elif new_version != True:
         return A(T('web2py is up to date'), _href=WEB2PY_URL)
     elif platform.system().lower() in ('windows','win32','win64') and os.path.exists("web2py.exe"):
-        return SPAN('You should upgrade to version %s' % version_number)
+        return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3])
     else:
         return sp_button(URL('upgrade_web2py'), T('upgrade now')) \
             + XML(' <strong class="upgrade_version">%s.%s.%s</strong>' \

gluon/contrib/markmin/markmin2html.py

@@ -544,7 +544,6 @@ regex_list=re.compile('^(?:(?:(#{1,6})|(?:(\.+|\++|\-+)(\.)?))\s+)?(.*)$')
 regex_bq_headline=re.compile('^(?:(\.+|\++|\-+)(\.)?\s+)?(-{3}-*)$')
 regex_tq=re.compile('^(-{3}-*)(?::(?P<c>[a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P<p>[a-zA-Z][_a-zA-Z\-\d]*)\])?)?$')
 regex_proto = re.compile(r'(?<!["\w>/=])(?P<p>\w+):(?P<k>\w+://[\w\d\-+=?%&/:.]+)', re.M)
-regex_auto = re.compile(r'(?<!["\w>/=])(?P<k>\w+://[^\s\'\"\]\}\)]+)',re.M)
 regex_auto = re.compile(r'(?<!["\w>/=])(?P<k>\w+://[\w\d\-+_=?%&/:.]+)',re.M)
 regex_link=re.compile(r'('+LINK+r')|\[\[(?P<s>.+?)\]\]')
 regex_link_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?(?:\s+(?P<p>popup))?\s*$')
@@ -1303,7 +1302,6 @@ def render(text,
             return '<pre><code%s%s>%s</code></pre>%s' % (cls, id, escape(code[1:-1]), pp)
         return '<code%s%s>%s</code>' % (cls, id, escape(code[beg:end]))
     text = regex_expand_meta.sub(expand_meta, text)
-    text = text.translate(ttab_out)
 
     if environment:
         def u2(match, environment=environment):
@@ -1316,7 +1314,8 @@ def render(text,
             return str(f)
         text = regex_env.sub(u2, text)
 
-    return text
+    return text.translate(ttab_out)
+
 
 def markmin2html(text, extra={}, allowed={}, sep='p',
                  autolinks='default', protolinks='default',

gluon/dal.py

@@ -8187,7 +8187,7 @@ class Expression(object):
         db = self.db
         if isinstance(value,(list, tuple)):
             subqueries = [self.contains(str(v).strip()) for v in value if str(v).strip()]
-            return reduce(all and AND or OR, subqueries)
+            return reduce(all and AND or OR, subqueries,self.contains(''))
         if not self.type in ('string', 'text') and not self.type.startswith('list:'):
             raise SyntaxError, "contains used with incompatible field type"
         return Query(db, db._adapter.CONTAINS, self, value)

gluon/sqlhtml.py

@@ -874,8 +874,9 @@ class SQLFORM(FORM):
         # if no fields are provided, build it from the provided table
         # will only use writable or readable fields, unless forced to ignore
         if fields is None:
-            fields = [f.name for f in table if (
+            fields = [f.name for f in table if 
-                    ignore_rw or f.writable or f.readable) and not f.compute]
+                      (ignore_rw or f.writable or f.readable) and 
+                      (readonly or not f.compute)]
         self.fields = fields
 
         # make sure we have an id