R-2.0.8

CHANGELOG

@@ -23,6 +23,7 @@
 - Support for Google App Engine projections, thanks Christian
 - Field(... 'upload', default=path) now accepts a path to a local file as default value, if user does not upload a file. Relative path looks inside current application folder, thanks Marin
 - executesql(...,fields=,columns=) allows parsing of results in Rows, thanks Anthony
+- Rows.find(lambda row: bool(), limitby=(0,1))
 
 ### Auth improvements
 

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.3 ('`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.3 (2012-08-31 14:27:45) 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>' \
@@ -249,6 +249,10 @@ def site():
             fname = request.vars.file.filename
             f = request.vars.file.file
             
+        else:
+            session.flash = 'No file uploaded and no URL specified'
+            redirect(URL(r=request))
+
         if f:
             appname = cleanpath(form_update.vars.name)
             installed = app_install(appname, f, 

applications/admin/languages/default.py

@@ -16,6 +16,8 @@
 'are not used yet': 'are not used yet',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
 'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
 'back': '<<back',
 'can be a git repo': 'can be a git repo',
 'Change admin password': 'Change admin password',
@@ -58,6 +60,7 @@
 'exposes': 'exposes',
 'exposes:': 'exposes:',
 'extends': 'extends',
+'failed to compile file because:': 'failed to compile file because:',
 'file does not exist': 'file does not exist',
 'file saved on %s': 'file saved on %s',
 'filter': 'filter',
@@ -70,7 +73,9 @@
 'inspect attributes': 'inspect attributes',
 'Install': 'Install',
 'Installed applications': 'Installed applications',
+'invalid password.': 'invalid password.',
 'Key bindings': 'Key bindings',
+'Language files (static strings) updated': 'Language files (static strings) updated',
 'languages': 'languages',
 'Languages': 'Languages',
 'Last saved on:': 'Last saved on:',
@@ -85,6 +90,7 @@
 'modules': 'modules',
 'New application wizard': 'New application wizard',
 'New simple application': 'New simple application',
+'online designer': 'online designer',
 'Overwrite installed app': 'Overwrite installed app',
 'Pack all': 'Pack all',
 'Peeking at file': 'Peeking at file',
@@ -107,6 +113,7 @@
 'Save via Ajax': 'Save via Ajax',
 'Saved file hash:': 'Saved file hash:',
 'session': 'session',
+'session expired': 'session expired',
 'shell': 'shell',
 'Site': 'Site',
 'Start wizard': 'Start wizard',

applications/admin/views/default.mobile/index.html

@@ -2,7 +2,9 @@
 
 <h2>web2py&trade; {{=T('Web Framework')}}</h2>
 <h3>{{=T('Login to the Administrative Interface')}}</h3>
-<div>
+
+{{if request.is_https or request.is_local:}}
+<div class="form">
   <form action="{{=URL(r=request)}}" method="post">
     <div><input type="hidden" name="send" value="{{=send}}"/></div>
     <table>
@@ -11,4 +13,6 @@
     </table>
   </form>
 </div>
-
+{{else:}}
+<p class="help">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
+{{pass}}

applications/examples/static/markmin.html

@@ -1,41 +1,92 @@
-<html><body><h1>Markmin markup language</h1><h2>About</h2><p>This is a new markup language that we call markmin designed to produce high quality scientific papers and books and also put them online. We provide serializers for html, latex and pdf. It is implemented in the <code class="">markmin2html</code> function in the <code class="">markmin2html.py</code>.</p><p>Example of usage:</p><pre><code class="">&gt;&gt;&gt; m = "Hello **world** [[link http://web2py.com]]"
-&gt;&gt;&gt; from markmin2html import markmin2html
-&gt;&gt;&gt; print markmin2html(m)
-&gt;&gt;&gt; from markmin2latex import markmin2latex
-&gt;&gt;&gt; print markmin2latex(m)
-&gt;&gt;&gt; from markmin2pdf import markmin2pdf # requires pdflatex
-&gt;&gt;&gt; print markmin2pdf(m)</code></pre><h2>Why?</h2><p>We wanted a markup language with the following requirements:</p><ul><li>less than 100 lines of functional code</li><li>easy to read</li><li>secure</li><li>support table, ul, ol, code</li><li>support html5 video and audio elements (html serialization only)</li><li>can align images and resize them</li><li>can specify class for tables and code elements</li><li>can add anchors</li><li>does not use _ for markup (since it creates odd behavior)</li><li>automatically links urls</li><li>fast</li><li>easy to extend</li><li>supports latex and pdf including references</li><li>allows to describe the markup in the markup (this document is generated from markmin syntax)</li></ul><p>(results depend on text but in average for text ~100K markmin is 30% faster than markdown, for text ~10K it is 10x faster)</p><p>The <a href="http://www.lulu.com/product/paperback/web2py-%283rd-edition%29/12822827">web2py book</a> published by lulu, for example, was entirely generated with markmin2pdf from the online <a href="http://www.web2py.com/book">web2py wiki</a></p><h2>Download</h2><ul><li>http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2html.py</li><li>http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2latex.py</li><li>http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2pdf.py</li></ul><p>markmin2html.py and markmin2latex.py are single files and have no web2py dependence. Their license is BSD.</p><h2>Examples</h2><h3>Bold, italic, code and links</h3><table class=""><tr><td><b>SOURCE</b>                </td><td><b>OUTPUT</b></td></tr><tr><td><code class=""># title</code>               </td><td><b>title</b></td></tr><tr><td><code class="">## section</code>            </td><td><b>section</b></td></tr><tr><td><code class="">### subsection</code>        </td><td><b>subsection</b></td></tr><tr><td><code class="">**bold**</code>              </td><td><b>bold</b></td></tr><tr><td><code class="">''italic''</code>            </td><td><i>italic</i></td></tr><tr><td><code class="">``verbatim``</code>      </td><td><code class="">verbatim</code></td></tr><tr><td><code class="">http://google.com</code>     </td><td>http://google.com</td></tr><tr><td><code class="">[[click me #myanchor]]</code></td><td><a href="#myanchor">click me</a></td></tr></table>
-<h3>More on links</h3><p>The format is always <code class="">[[title link]]</code>. Notice you can nest bold, italic and code inside the link title.</p><h3>Anchors <span id="myanchor"><span></h3><p>You can place an anchor anywhere in the text using the syntax <code class="">[[name]]</code> where <i>name</i> is the name of the anchor.
-You can then link the anchor with <a href="#myanchor">link</a>, i.e. <code class="">[[link #myanchor]]</code>.</p><h3>Images</h3><p><img src="http://www.web2py.com/examples/static/web2py_logo.png" alt="some image" align="right" width="200px" />
-This paragraph has an image aligned to the right with a width of 200px. Its is placed using the code</p><p><code class="">[[some image http://www.web2py.com/examples/static/web2py_logo.png right 200px]]</code>.</p><h3>Unordered Lists</h3><pre><code class="">- Dog
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<style>
+  blockquote { background-color: #FFFAAE; padding: 7px; }
+  table { border-collapse: collapse; }
+  thead td { border-bottom: 1px solid; }
+  tfoot td { border-top: 1px solid; }
+  .tableclass1 { background-color: lime; }
+  .tableclass1 thead { color: yellow; background-color: green; }
+  .tableclass1 tfoot { color: yellow; background-color: green; }
+  .tableclass1 .even td { background-color: #80FF7F; }
+  .tableclass1 .first td {border-top: 1px solid; }
+
+  td.num { text-align: right; }
+  pre { background-color: #E0E0E0; padding: 5px; }
+</style>
+<title>Markmin markup language</title>
+</head>
+<body>
+<h1>Markmin markup language</h1><h2>About</h2><p>This is a new markup language that we call markmin designed to produce high quality scientific papers and books and also put them online. We provide serializers for html, latex and pdf. It is implemented in the <code>markmin2html</code> function in the <code>markmin2html.py</code>.</p><p>Example of usage:</p><pre><code>m = "Hello **world** [[link http://web2py.com]]"
+from markmin2html import markmin2html
+print markmin2html(m)
+from markmin2latex import markmin2latex
+print markmin2latex(m)
+from markmin2pdf import markmin2pdf # requires pdflatex
+print markmin2pdf(m)</code></pre> ====================<h1>This is a test block with new features:</h1><p>This is a blockquote with a list with tables in it:</p><blockquote class="blockquoteclass" id="markmin_blockquoteid">This is a paragraph before list. You can continue paragraph on the next lines.<br />This is an ordered list with tables:<ol><li>Item 1</li><li>Item 2</li><li><table class="tableclass1" id="markmin_tableid1"><tbody><tr class="first"><td>aa</td><td>bb</td><td>cc</td></tr><tr class="even"><td class="num">11</td><td class="num">22</td><td class="num">33</td></tr></tbody></table></li><li>Item 4 <table class="tableclass1"><thead><tr class="first"><td>T1</td><td>T2</td><td>t3</td></tr></thead><tbody><tr class="first"><td>aaa</td><td>bbb</td><td>ccc</td></tr><tr class="even"><td>ddd</td><td>fff</td><td>ggg</td></tr><tr><td class="num">123</td><td class="num">0</td><td class="num">5.0</td></tr></tbody></table></li></ol></blockquote><p>This this a new paragraph with a table. Table has header, footer, sections, odd and even rows:</p><table class="tableclass1" id="markmin_tableid2"><thead><tr class="first"><td><strong>Title 1</strong></td><td><strong>Title 2</strong></td><td><strong>Title 3</strong></td></tr></thead><tbody><tr class="first"><td>data 1</td><td>data 2</td><td class="num">2.00</td></tr><tr class="even"><td>data 3</td><td>data4(long)</td><td class="num">23.00</td></tr><tr><td></td><td>data 5</td><td class="num">33.50</td></tr><tr class="first"><td>New section</td><td>New data</td><td class="num">5.00</td></tr><tr class="even"><td>data 1</td><td>data2(long)</td><td class="num">100.45</td></tr><tr><td></td><td>data 3</td><td class="num">12.50</td></tr><tr class="even"><td>data 4</td><td>data 5</td><td class="num">.33</td></tr><tr><td>data 6</td><td>data7(long)</td><td class="num">8.01</td></tr><tr class="even"><td></td><td>data 8</td><td class="num">514</td></tr></tbody><tfoot><tr class="first"><td>Total:</td><td>9 items</td><td>698,79</td></tr></tfoot></table><h2>Multilevel lists</h2><p>Now lists can be multilevel:</p><ol><li>Ordered item 1 on level 1. You can continue item text on next strings<ol><li><p>Ordered item 1 of sublevel 2 with a paragraph (paragraph can start with point after plus or minus characters, e.g. <strong>++.</strong> or <strong>--.</strong>)</p><li><p>This is another item. But with 3 paragraphs, blockquote and sublists:</p><p>This is the second paragraph in the item. You can add paragraphs to an item, using point notation, where first characters in the string are sequence of points with space between them and another string. For example, this paragraph (in sublevel 2) starts with two points:</p><code>.. This is the second paragraph...</code><blockquote><h3>this is a blockquote in a list</h3>You can use blockquote with headers, paragraphs, tables and lists in it:<br />Tables can have or have not header and footer. This table is defined without any header and footer in it:<table><tbody><tr class="first"><td>red</td><td>fox</td><td class="num">0</td></tr><tr class="even"><td>blue</td><td>dolphin</td><td class="num">1000</td></tr><tr><td>green</td><td>leaf</td><td class="num">10000</td></tr></tbody></table></blockquote><p>This is yet another paragraph in the item.</p><ul><li>This is an item of unordered list <strong>(sublevel 3)</strong></li><li>This is the second item of the unordered list <em>(sublevel 3)</em><ol><ol><ol><li>This is a single item of ordered list in sublevel 6</li></ol></ol><p>and this is a paragraph in sublevel 4</p></ol></li><li><p>This is a new item with paragraph in sublevel 3.</p><ol><li>Start ordered list in sublevel 4 with code block: <pre><code>line 1
+  line 2
+     line 3</code></pre></li><li><p>Yet another item with code block:</p><pre><code>  line 1
+line 2
+  line 3</code></pre> This item finishes with this paragraph.</li></ol><p>Item in sublevel 3 can be continued with paragraphs.</p><pre><code>  this is another
+code block
+    in the
+  sublevel 3 item</code></pre></li></ul><ol><li>The last item in sublevel 3</li></ol><p>This is a continuous paragraph for item 2 in sublevel 2. You can use such structure to create difficult structured documents.</p><li>item 3 in sublevel 2</li></li></li></ol><ul><li>item 1 in sublevel 2 (new unordered list)</li><li>item 2 in sublevel 2</li><li>item 3 in sublevel 2</li></ul><ol><li>item 1 in sublevel 2 (new ordered list)</li><li>item 2 in sublevel 2</li><li>item 3 in sublevle 2</li></ol></li><li>item 2 in level 1</li><li>item 3 in level 1</li></ol><ul><li>new unordered list (item 1 in level 1)</li><li>level 2 in level 1</li><li>level 3 in level 1</li><li>level 4 in level 1</li></ul><h2>This is the last section of the test</h2><p>Single paragraph with '----' in it will be turned into separator:</p><hr /><p>And this is the last paragraph in the test. Be happy!</p><p>====================</p><h2>Why?</h2><p>We wanted a markup language with the following requirements:</p><ul><li>less than 300 lines of functional code</li><li>easy to read</li><li>secure</li><li>support table, ul, ol, code</li><li>support html5 video and audio elements (html serialization only)</li><li>can align images and resize them</li><li>can specify class for tables and code elements</li><li>can add anchors</li><li>does not use _ for markup (since it creates odd behavior)</li><li>automatically links urls</li><li>fast</li><li>easy to extend</li><li>supports latex and pdf including references</li><li>allows to describe the markup in the markup (this document is generated from markmin syntax)</li></ul><p>(results depend on text but in average for text ~100K markmin is 30% faster than markdown, for text ~10K it is 10x faster)</p><p>The <a href="http://www.lulu.com/product/paperback/web2py-%283rd-edition%29/12822827">web2py book</a> published by lulu, for example, was entirely generated with markmin2pdf from the online <a href="http://www.web2py.com/book">web2py wiki</a></p><h2>Download</h2><ul><li><a href="http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2html.py">http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2html.py</a></li><li><a href="http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2latex.py">http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2latex.py</a></li><li><a href="http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2pdf.py">http://web2py.googlecode.com/hg/gluon/contrib/markmin/markmin2pdf.py</a></li></ul><p>markmin2html.py and markmin2latex.py are single files and have no web2py dependence. Their license is BSD.</p><h2>Examples</h2><h3>Bold, italic, code and links</h3><table><thead><tr class="first"><td><strong>SOURCE</strong></td><td><strong>OUTPUT</strong></td></tr></thead><tbody><tr class="first"><td><code># title</code></td><td><strong>title</strong></td></tr><tr class="even"><td><code>## section</code></td><td><strong>section</strong></td></tr><tr><td><code>### subsection</code></td><td><strong>subsection</strong></td></tr><tr class="even"><td><code>**bold**</code></td><td><strong>bold</strong></td></tr><tr><td><code>''italic''</code></td><td><em>italic</em></td></tr><tr class="even"><td><code>~~strikeout~~</code></td><td><del>strikeout</del></td></tr><tr><td><code>``verbatim``</code></td><td><code>verbatim</code></td></tr><tr class="even"><td><code>``color with **bold**``:red</code></td><td><span style="color: red">color with <strong>bold</strong></span></td></tr><tr><td><code>``many colors``:color[blue:#ffff00]</code></td><td><span style="color: blue;background-color: #ffff00;">many colors</span></td></tr><tr class="even"><td><code>http://google.com</code></td><td><a href="http://google.com">http://google.com</a></td></tr><tr><td><code>[[**click** me #myanchor]]</code></td><td><a href="#markmin_myanchor"><strong>click</strong> me</a></td></tr><tr class="even"><td><code>[[click me [extra info] #myanchor popup]]</code></td><td><a href="#markmin_myanchor" title="extra info" target="_blank">click me</a></td></tr></tbody></table><h3>More on links</h3><p>The format is always <code>[[title link]]</code> or <code>[[title [extra] link]]</code>. Notice you can nest bold, italic, strikeout and code inside the link <code>title</code>.</p><h3>Anchors <a name="markmin_myanchor"></a></h3><p>You can place an anchor anywhere in the text using the syntax <code>[[name]]</code> where <em>name</em> is the name of the anchor. You can then link the anchor with <a href="#markmin_myanchor">link</a>, i.e. <code>[[link #myanchor]]</code> or <a href="#markmin_myanchor" title="extra info">link with an extra info</a>, i.e. <code>[[link with an extra info [extra info] #myanchor]]</code>.</p><h3>Images</h3><p><img src="http://www.web2py.com/examples/static/web2py_logo.png" alt="alt-string for the image" title="the image title" style="float:right" width="200px" /> This paragraph has an image aligned to the right with a width of 200px. Its is placed using the code</p><p><code>[[alt-string for the imaLine truncated
 - Cat
-- Mouse</code></pre><p>is rendered as</p><ul><li>Dog</li><li>Cat</li><li>Mouse</li></ul><p>Two new lines between items break the list in two lists.</p><h3>Ordered Lists</h3><pre><code class="">+ Dog
+- Mouse</code></pre><p>is rendered as</p><ul><li>Dog</li><li>Cat</li><li>Mouse</li></ul><p>Two new lines between items break the list in two lists.</p><h3>Ordered Lists</h3><pre><code>+ Dog
 + Cat
-+ Mouse</code></pre><p>is rendered as</p><ol><li>Dog</li><li>Cat</li><li>Mouse</li></ol><h3>Tables</h3><p>Something like this
-<pre><code class="">---------
++ Mouse</code></pre><p>is rendered as</p><ol><li>Dog</li><li>Cat</li><li>Mouse</li></ol><h3>Multilevel Lists</h3><pre><code>+ Dogs
+ -- red
+ -- brown
+ -- black
++ Cats
+ -- fluffy
+ -- smooth
+ -- bald
++ Mice
+ -- small
+ -- big
+ -- huge</code></pre><p>is rendered as</p><ol><li>Dogs<ul><li>red</li><li>brown</li><li>black</li></ul></li><li>Cats<ul><li>fluffy</li><li>smooth</li><li>bald</li></ul></li><li>Mice<ul><li>small</li><li>big</li><li>huge</li></ul></li></ol><h3>Tables (with optional header and/or footer)</h3><p>Something like this</p><pre><code>-----------------
 **A**|**B**|**C**
+=================
   0  |  0  |  X
   0  |  X  |  0
   X  |  0  |  0
------:abc</code></pre>
-is a table and is rendered as
-<table class="abc"><tr><td><b>A</b></td><td><b>B</b></td><td><b>C</b></td></tr><tr><td>0</td><td>0</td><td>X</td></tr><tr><td>0</td><td>X</td><td>0</td></tr><tr><td>X</td><td>0</td><td>0</td></tr></table>Four or more dashes delimit the table and | separates the columns.
-The <code class="">:abc</code> at the end sets the class for the table and it is optional.</p><h3>Blockquote</h3><p>A table with a single cell is rendered as a blockquote:</p><blockquote class="">Hello world</blockquote>
-<h3>Code, <code class="">&lt;code&gt;</code>, escaping and extra stuff</h3><pre><code class="python">def test():
-    return "this is Python code"</code></pre><p>Optionally a ` inside a <code class="">``...``</code> block can be inserted escaped with !`!.
-The <code class="">:python</code> after the markup is also optional. If present, by default, it is used to set the class of the &lt;code&gt; block.
-The behavior can be overridden by passing an argument <code class="">extra</code> to the <code class="">render</code> function. For example:</p><pre><code class="python">&gt;&gt;&gt; markmin2html("``aaa``:custom",
-       extra=dict(custom=lambda text: 'x'+text+'x'))</code></pre><p>generates</p><code class="python">'xaaax'</code><p>(the <code class="">``...``:custom</code> block is rendered by the <code class="">custom=lambda</code> function passed to <code class="">render</code>).</p><h3>Html5 support</h3><p>Markmin also supports the &lt;video&gt; and &lt;audio&gt; html5 tags using the notation:
-<pre><code class="">[[title link video]]
-[[title link audio]]</code></pre></p><h3>Latex and other extensions</h3><p>Formulas can be embedded into HTML with <code class="">$</code><code class="">$</code>formula<code class="">$</code><code class="">$</code>.
-You can use Google charts to render the formula:</p><pre><code class="">&gt;&gt;&gt; LATEX = '&lt;img src="http://chart.apis.google.com/chart?cht=tx&amp;chl=%s" align="center"/&gt;'
-&gt;&gt;&gt; markmin2html(text,{'latex':lambda code: LATEX % code.replace('"','"')})</code></pre><h3>Code with syntax highlighting</h3><p>This requires a syntax highlighting tool, such as the web2py CODE helper.</p><pre><code class="">&gt;&gt;&gt; extra={'code_cpp':lambda text: CODE(text,language='cpp').xml(),
+=================
+**D**|**F**|**G**
+-----------------:abc[id]</code></pre> is a table and is rendered as<table class="abc" id="markmin_id"><thead><tr class="first"><td><strong>A</strong></td><td><strong>B</strong></td><td><strong>C</strong></td></tr></thead><tbody><tr class="first"><td class="num">0</td><td class="num">0</td><td>X</td></tr><tr class="even"><td class="num">0</td><td>X</td><td class="num">0</td></tr><tr><td>X</td><td class="num">0</td><td class="num">0</td></tr></tbody><tfoot><tr class="first"><td><strong>D</strong></td><td><strong>F</strong></td><td><strong>G</strong></td></tr></tfoot></table> Four or more dashes delimit the table and | separates the columns. The <code>:abc</code>, <code>:id[abc_1]</code> or <code>:abc[abc_1]</code> at the end sets the class and/or id for the table and it is optional.<h3>Blockquote</h3><p>A table with a single cell is rendered as a blockquote:</p><blockquote>Hello world</blockquote><p>Blockquote can contain headers, paragraphs, lists and tables:</p><pre><code>-----
+  This is a paragraph in a blockquote
+
+  + item 1
+  + item 2
+  -- item 2.1
+  -- item 2.2
+  + item 3
+
+  ---------
+  0 | 0 | X
+  0 | X | 0
+  X | 0 | 0
+  ---------:tableclass1
+-----</code></pre><p>is rendered as:</p><blockquote>This is a paragraph in a blockquote<ol><li>item 1</li><li>item 2<ul><li>item 2.1</li><li>item 2.2</li></ul></li><li>item 3</li></ol><table class="tableclass1"><tbody><tr class="first"><td class="num">0</td><td class="num">0</td><td>X</td></tr><tr class="even"><td class="num">0</td><td>X</td><td class="num">0</td></tr><tr><td>X</td><td class="num">0</td><td class="num">0</td></tr></tbody></table></blockquote><h3>Code, <code>&lt;code&gt;</code>, escaping and extra stuff</h3><pre><code class="python">def test():
+    return "this is Python code"</code></pre><p>Optionally a ` inside a <code>``...``</code> block can be inserted escaped with !`!.</p><p><strong>NOTE:</strong> You can escape markmin constructions ('',``,**,~~,[,{,]},$,@) with '\' character: so \`\` can replace !`!`! escape string</p><p>The <code>:python</code> after the markup is also optional. If present, by default, it is used to set the class of the &lt;code&gt; block. The behavior can be overridden by passing an argument <code>extra</code> to the <code>render</code> function. For example:</p><pre><code class="python">markmin2html("``aaa``:custom",
+             extra=dict(custom=lambda text: 'x'+text+'x'))</code></pre><p>generates</p><code class="python">'xaaax'</code><p>(the <code>``...``:custom</code> block is rendered by the <code>custom=lambda</code> function passed to <code>render</code>).</p><h3>Html5 support</h3><p>Markmin also supports the &lt;video&gt; and &lt;audio&gt; html5 tags using the notation:</p><pre><code>[[message link video]]
+[[message link audio]]
+
+[[message [title] link video]]
+[[message [title] link audio]]</code></pre> where <code>message</code> will be shown in brousers without HTML5 video/audio tags support.<h3>Latex and other extensions</h3><p>Formulas can be embedded into HTML with <em>$$<code>formula</code>$$</em>. You can use Google charts to render the formula:</p><pre><code>LATEX = '&lt;img src="http://chart.apis.google.com/chart?cht=tx&amp;chl=%s" /&gt;'
+markmin2html(text,{'latex':lambda code: LATEX % code.replace('"','\"')})</code></pre><h3>Code with syntax highlighting</h3><p>This requires a syntax highlighting tool, such as the web2py CODE helper.</p><pre><code>extra={'code_cpp':lambda text: CODE(text,language='cpp').xml(),
        'code_java':lambda text: CODE(text,language='java').xml(),
        'code_python':lambda text: CODE(text,language='python').xml(),
-           'code_html':lambda text: CODE(text,language='html').xml()}
-&gt;&gt;&gt; markmin2html(text,extra=extra)</code></pre><p>Code can now be marked up as in this example:</p><pre><code class="">``
+       'code_html':lambda text: CODE(text,language='html').xml()}</code></pre> or simple:<pre><code>extra={'code':lambda text,lang='python': CODE(text,language=lang).xml()}</code></pre><pre><code>markmin2html(text,extra=extra)</code></pre><p>Code can now be marked up as in this example:</p><pre><code>``
 &lt;html&gt;&lt;body&gt;example&lt;/body&gt;&lt;/html&gt;
-``:code_html</code></pre><h3>Citations and References</h3><p>Citations are treated as internal links in html and proper citations in latex if there is a final section called "References". Items like</p><pre><code class="">- [[key]] value</code></pre><p>in the References will be translated into Latex</p><pre><code class="">\bibitem{key} value</code></pre><p>Here is an example of usage:</p><pre><code class="">As shown in Ref.``mdipierro``:cite
+``:code_html</code></pre> OR<pre><code>``
+&lt;html&gt;&lt;body&gt;example&lt;/body&gt;&lt;/html&gt;
+``:code[html]</code></pre><h3>Citations and References</h3><p>Citations are treated as internal links in html and proper citations in latex if there is a final section called "References". Items like</p><pre><code>- [[key]] value</code></pre><p>in the References will be translated into Latex</p><pre><code>\bibitem{key} value</code></pre><p>Here is an example of usage:</p><pre><code>As shown in Ref.``mdipierro``:cite
 
 ## References
-- [[mdipierro]] web2py Manual, 3rd Edition, lulu.com</code></pre><h3>Caveats</h3><p><code class="">&lt;ul/&gt;</code>, <code class="">&lt;ol/&gt;</code>, <code class="">&lt;code/&gt;</code>, <code class="">&lt;table/&gt;</code>, <code class="">&lt;blockquote/&gt;</code>, <code class="">&lt;h1/&gt;</code>, ..., <code class="">&lt;h6/&gt;</code> do not have <code class="">&lt;p&gt;...&lt;/p&gt;</code> around them.</p></body></html>
+
+- [[mdipierro]] web2py Manual, 3rd Edition, lulu.com</code></pre><h3>Caveats</h3><p><code>&lt;ul/&gt;</code>, <code>&lt;ol/&gt;</code>, <code>&lt;code/&gt;</code>, <code>&lt;table/&gt;</code>, <code>&lt;blockquote/&gt;</code>, <code>&lt;h1/&gt;</code>, ..., <code>&lt;h6/&gt;</code> do not have <code>&lt;p&gt;...&lt;/p&gt;</code> around them.</p>
+</body>
+</html>

applications/welcome/languages/it.py

@@ -60,6 +60,7 @@
 'edit profile': 'modifica profilo',
 'Edit This App': 'Modifica questa applicazione',
 'Email and SMS': 'Email and SMS',
+'Email non valida': 'Email non valida',
 'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
 'Errors': 'Errors',
 'export as csv file': 'esporta come file CSV',
@@ -95,6 +96,7 @@
 'Layouts': 'Layouts',
 'Live Chat': 'Live Chat',
 'Logged in': 'Logged in',
+'Logged out': 'Logged out',
 'login': 'accesso',
 'Login': 'Login',
 'logout': 'uscita',
@@ -113,6 +115,7 @@
 'new record inserted': 'nuovo record inserito',
 'next 100 rows': 'prossime 100 righe',
 'No databases in this application': 'Nessun database presente in questa applicazione',
+'Non può essere vuoto': 'Non può essere vuoto',
 'not authorized': 'non autorizzato',
 'Object or table name': 'Object or table name',
 'Online examples': 'Vedere gli esempi',
@@ -166,12 +169,14 @@
 'This App': 'This App',
 'This is a copy of the scaffolding application': "Questa è una copia dell'applicazione di base (scaffold)",
 'Timestamp': 'Ora (timestamp)',
+'too short': 'too short',
 'Twitter': 'Twitter',
 'unable to parse csv file': 'non riesco a decodificare questo file CSV',
 'Update': 'Update',
 'Update:': 'Aggiorna:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
 'User %(id)s Logged-in': 'User %(id)s Logged-in',
+'User %(id)s Logged-out': 'User %(id)s Logged-out',
 'User %(id)s Registered': 'User %(id)s Registered',
 'User ID': 'ID Utente',
 'Verify Password': 'Verify Password',

applications/welcome/static/css/web2py.css

@@ -15,9 +15,9 @@ td,th {text-align:left; padding:2px 5px 2px 5px}
 th {vertical-align:middle; border-right:1px solid white}
 td {vertical-align:top}
 form table tr td label {text-align:left}
-p,table,ol,ul {padding:0; margin: 0.5em 0}
+p,table,ol,ul {padding:0; margin: 0.75em 0}
 p {text-align:justify}
-ol, ul {list-style-position:inside}
+ol, ul {list-style-position:outside; margin-left:2em}
 li {margin-bottom:0.5em}
 span,input,select,textarea,button,label,a {display:inline}
 img {border:0}
@@ -39,13 +39,6 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px}
 
 /* Sticky footer begin */
 
-.wrapper {
-  min-height:100%;
-  height:auto !important;
-  height:100%;
-  margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */
-}
-
 .main {
   padding:20px 0 50px 0;
 }

applications/welcome/views/layout.html

@@ -129,7 +129,7 @@
     </section><!--/main-->
     
     <!-- Footer ================================================== -->
-    <footer class="footer">
+    <footer class="footer" id="footer">
       {{block footer}} <!-- this is default footer -->
       <div class="footer-content">
 	<div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>

gluon/cache.py

@@ -40,7 +40,6 @@ __all__ = ['Cache', 'lazy_cache']
 
 DEFAULT_TIME_EXPIRE = 300
 
-
 class CacheAbstract(object):
     """
     Abstract class for cache implementations.

gluon/compileapp.py

@@ -91,6 +91,18 @@ def _TEST():
 _TEST()
 """
 
+CACHED_REGEXES = {}
+CACHED_REGEXES_MAX_SIZE = 1000
+
+def re_compile(regex):
+    try:
+        return CACHED_REGEXES[regex]
+    except KeyError:
+        if len(CACHED_REGEXES) >= CACHED_REGEXES_MAX_SIZE:
+            CACHED_REGEXES.clear()
+        compiled_regex = CACHED_REGEXES[regex] = re.compile(regex)
+        return compiled_regex
+
 class mybuiltin(object):
     """
     NOTE could simple use a dict and populate it,
@@ -355,6 +367,10 @@ def build_environment(request, response, session, store_current=True):
     environment.update((k,getattr(v, k)) for k in v.__all__)
     if not request.env:
         request.env = Storage()
+    # Enable standard conditional models (i.e., /*.py, /[controller]/*.py, and
+    # /[controller]/[function]/*.py)
+    response.models_to_run = [r'^\w+\.py$', r'^%s/\w+\.py$' % request.controller,
+        r'^%s/%s/\w+\.py$' % (request.controller, request.function)]
         
     t = environment['T'] = translator(request)
     c = environment['cache'] = Cache(request)
@@ -485,9 +501,13 @@ def run_models_in(environment):
         path = pjoin(folder, 'models')
         models = listdir(path, '^\w+\.py$',0,sort=False)
         compiled=False
-    paths = (path, pjoin(path,c), pjoin(path,c,f))
+    n = len(path) + 1
     for model in models:
-        if not os.path.split(model)[0] in paths and c!='appadmin':
+        regex = environment['response'].models_to_run
+        if isinstance(regex, list):
+            regex = re_compile('|'.join(regex))
+        file = model[n:].replace(os.path.sep, '/').replace('.pyc', '.py')
+        if not regex.search(file) and c!= 'appadmin':
             continue
         elif compiled:
             code = read_pyc(model)
@@ -581,10 +601,13 @@ def run_view_in(environment):
     folder = request.folder
     path = pjoin(folder, 'compiled')
     badv = 'invalid view (%s)' % view
-    patterns = response.generic_patterns or []
-    regex = re.compile('|'.join(map(fnmatch.translate, patterns)))
+    if response.generic_patterns:
+        patterns = response.generic_patterns
+        regex = re_compile('|'.join(map(fnmatch.translate, patterns)))
         short_action =  '%(controller)s/%(function)s.%(extension)s' % request
-    allow_generic = patterns and regex.search(short_action)
+        allow_generic = regex.search(short_action)
+    else:
+        allow_generic = False
     if not isinstance(view, str):
         ccode = parse_template(view, pjoin(folder, 'views'),
                                context=environment)

gluon/contrib/markmin/markmin2html.py

@@ -620,7 +620,7 @@ def render(text,
     - class_prefix is a prefix for ALL classes in markmin text. E.g. if class_prefix='my_'
       then for ``test``:cls class will be changed to "my_cls" (default value is '')
     - id_prefix is prefix for ALL ids in markmin text (default value is 'markmin_'). E.g.:
-        -- [[id]] will be converted to <a name="markmin_id"></a>
+        -- [[id]] will be converted to <div class="anchor" id="markmin_id"></div>
         -- [[link #id]] will be converted to <a href="#markmin_id">link</a>
         -- ``test``:cls[id] will be converted to <code class="cls" id="markmin_id">test</code>
 
@@ -837,17 +837,6 @@ def render(text,
                        args=args.split('/'), scheme=True, host=True)
         text = regex_URL.sub(u1,text)
 
-    if environment:
-        def u2(match, environment=environment):
-            f = environment.get(match.group('a'), match.group(0))
-            if callable(f):
-                try:
-                    f = f(match.group('b'))
-                except Exception, e:
-                    f = 'ERROR: %s' % e
-            return str(f)
-        text = regex_env.sub(u2, text)
-
     if latex == 'google':
         text = regex_dd.sub('``\g<latex>``:latex ', text)
 
@@ -1313,8 +1302,20 @@ 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)
-    return text
+
+    if environment:
+        def u2(match, environment=environment):
+            f = environment.get(match.group('a'), match.group(0))
+            if callable(f):
+                try:
+                    f = f(match.group('b'))
+                except Exception, e:
+                    f = 'ERROR: %s' % e
+            return str(f)
+        text = regex_env.sub(u2, text)
+
+    return text.translate(ttab_out)
+
 
 def markmin2html(text, extra={}, allowed={}, sep='p',
                  autolinks='default', protolinks='default',
@@ -1403,3 +1404,4 @@ if __name__ == '__main__':
         print "       file.markmin  [file.css] - process file.markmin + built in file.css (optional)"
         print "       file.markmin  [@path_to/css] - process file.markmin + link path_to/css (optional)"
         run_doctests()
+

gluon/custom_import.py

@@ -66,12 +66,14 @@ class _BaseImporter(object):
         help the management of this aspect.
         """
 
+    def __init__(self):
+        self._STANDARD_PYTHON_IMPORTER = _STANDARD_PYTHON_IMPORTER
     def __call__(self, name, globals=None, locals=None,
                  fromlist=None, level=-1):
         """
         The import method itself.
         """
-        return _STANDARD_PYTHON_IMPORTER(name,
+        return self._STANDARD_PYTHON_IMPORTER(name,
                                          globals,
                                          locals,
                                          fromlist,
@@ -226,7 +228,8 @@ class _Web2pyImporter(_BaseImporter):
         """
 
         global DEBUG
-        super(_Web2pyImporter, self).__init__()
+        self.super_class = super(_Web2pyImporter, self)
+        self.super_class.__init__()
         self.web2py_path =  web2py_path
         self.__web2py_path_os_path_sep = self.web2py_path+os.path.sep
         self.__web2py_path_os_path_sep_len = len(self.__web2py_path_os_path_sep)
@@ -284,16 +287,16 @@ class _Web2pyImporter(_BaseImporter):
                             globals, locals, fromlist, level)
                     else:
                         # import like "from x import a, b, ..."
-                        return super(_Web2pyImporter, self) \
+                        return self.super_class \
                             .__call__(modules_prefix+"."+name,
                                     globals, locals, fromlist, level)
                 except ImportError, e:
                     try:
-                        return super(_Web2pyImporter, self).__call__(name, globals, locals,
+                        return self.super_class.__call__(name, globals, locals,
                                                     fromlist, level)
                     except ImportError, e1:
                         raise e
-        return super(_Web2pyImporter, self).__call__(name, globals, locals,
+        return self.super_class.__call__(name, globals, locals,
                                                     fromlist, level)
 
     def __import__dot(self, prefix, name, globals, locals, fromlist,

gluon/dal.py

@@ -227,15 +227,21 @@ thread = threading.local()
 # internal representation of tables with field
 #  <table>.<field>, tables and fields may only be [a-zA-Z0-9_]
 
-regex_type = re.compile('^([\w\_\:]+)')
-regex_dbname = re.compile('^(\w+)(\:\w+)*')
-regex_safe = re.compile('^\w+$')
-regex_table_field = re.compile('^(\w+)\.(\w+)$')
-regex_content = re.compile('(?P<table>[\w\-]+)\.(?P<field>[\w\-]+)\.(?P<uuidkey>[\w\-]+)\.(?P<name>\w+)\.\w+$')
-regex_cleanup_fn = re.compile('[\'"\s;]+')
-string_unpack=re.compile('(?<!\|)\|(?!\|)')
-regex_python_keywords = re.compile('^(and|del|from|not|while|as|elif|global|or|with|assert|else|if|pass|yield|break|except|import|print|class|exec|in|raise|continue|finally|is|return|def|for|lambda|try)$')
-regex_select_as_parser = re.compile("\s+AS\s+(\S+)")
+REGEX_TYPE = re.compile('^([\w\_\:]+)')
+REGEX_DBNAME = re.compile('^(\w+)(\:\w+)*')
+REGEX_W = re.compile('^\w+$')
+REGEX_TABLE_DOT_FIELD = re.compile('^(\w+)\.(\w+)$')
+REGEX_UPLOAD_PATTERN = re.compile('(?P<table>[\w\-]+)\.(?P<field>[\w\-]+)\.(?P<uuidkey>[\w\-]+)\.(?P<name>\w+)\.\w+$')
+REGEX_CLEANUP_FN = re.compile('[\'"\s;]+')
+REGEX_UNPACK = re.compile('(?<!\|)\|(?!\|)')
+REGEX_PYTHON_KEYWORDS = re.compile('^(and|del|from|not|while|as|elif|global|or|with|assert|else|if|pass|yield|break|except|import|print|class|exec|in|raise|continue|finally|is|return|def|for|lambda|try)$')
+REGEX_SELECT_AS_PARSER = re.compile("\s+AS\s+(\S+)")
+REGEX_CONST_STRING = re.compile('(\"[^\"]*?\")|(\'[^\']*?\')')
+REGEX_SEARCH_PATTERN = re.compile('^{[^\.]+\.[^\.]+(\.(lt|gt|le|ge|eq|ne|contains|startswith|year|month|day|hour|minute|second))?(\.not)?}$')
+REGEX_SQUARE_BRACKETS = re.compile('^.+\[.+\]$')
+REGEX_STORE_PATTERN = re.compile('\.(?P<e>\w{1,5})$')
+REGEX_QUOTES = re.compile("'[^']*'")
+REGEX_ALPHANUMERIC = re.compile('^[a-zA-Z]\w*$')
 
 # list of drivers will be built on the fly
 # and lists only what is available
@@ -434,7 +440,7 @@ def AND(a,b):
 def IDENTITY(x): return x
 
 def varquote_aux(name,quotestr='%s'):
-    return name if regex_safe.match(name) else quotestr % name
+    return name if REGEX_W.match(name) else quotestr % name
 
 if 'google' in DRIVERS:
 
@@ -1397,7 +1403,7 @@ class BaseAdapter(ConnectionPool):
             if isinstance(item,SQLALL):
                 new_fields += item._table
             elif isinstance(item,str):
-                if regex_table_field.match(item):
+                if REGEX_TABLE_DOT_FIELD.match(item):
                     tablename,fieldname = item.split('.')
                     append(db[tablename][fieldname])
                 else:
@@ -1419,7 +1425,7 @@ class BaseAdapter(ConnectionPool):
         tablenames = tables(query)
         for field in fields:
             if isinstance(field, basestring) \
-                    and regex_table_field.match(field):
+                    and REGEX_TABLE_DOT_FIELD.match(field):
                 tn,fn = field.split('.')
                 field = self.db[tn][fn]
             for tablename in tables(field):
@@ -1762,7 +1768,7 @@ class BaseAdapter(ConnectionPool):
         elif field_type == 'blob' and not blob_decode:
             return value
         else:
-            key = regex_type.match(field_type).group(0)
+            key = REGEX_TYPE.match(field_type).group(0)
             return self.parsemap[key](value,field_type)
 
     def parse_reference(self, value, field_type):
@@ -1793,18 +1799,18 @@ class BaseAdapter(ConnectionPool):
 
     def parse_datetime(self, value, field_type):
         if not isinstance(value, datetime.datetime):
-            if '+' in value:
-                value,tz = value.split('+')
+            value = str(value)
+            date_part,time_part,timezone = value[:10],value[11:19],value[19:]
+            if '+' in timezone:
+                ms,tz = timezone.split('+')
                 h,m = tz.split(':')
                 dt = datetime.timedelta(seconds=3600*int(h)+60*int(m))
-            elif '-' in value:
-                value,tz = value.split('-')
+            elif '-' in timezone:
+                ms,tz = timezone.split('-')
                 h,m = tz.split(':')
                 dt = -datetime.timedelta(seconds=3600*int(h)+60*int(m))
             else:
                 dt = None
-            date_part, time_part = (
-                str(value).replace('T',' ')+' ').split(' ',1)
             (y, m, d) = map(int,date_part.split('-'))
             time_parts = time_part and time_part.split(':')[:3] or (0,0,0)
             while len(time_parts)<3: time_parts.append(0)
@@ -1877,7 +1883,7 @@ class BaseAdapter(ConnectionPool):
         new_rows = []
         tmps = []
         for colname in colnames:
-            if not regex_table_field.match(colname):
+            if not REGEX_TABLE_DOT_FIELD.match(colname):
                 tmps.append(None)
             else:
                 (tablename, fieldname) = colname.split('.')
@@ -1933,7 +1939,7 @@ class BaseAdapter(ConnectionPool):
                         self.parse_value(value,
                                          fields[j].type,blob_decode)
                     new_column_name = \
-                        regex_select_as_parser.search(colname)
+                        REGEX_SELECT_AS_PARSER.search(colname)
                     if not new_column_name is None:
                         column_name = new_column_name.groups(0)
                         setattr(new_row,column_name[0],value)
@@ -2283,6 +2289,8 @@ class MySQLAdapter(BaseAdapter):
     def concat_add(self,table):
         return '; ALTER TABLE %s ADD ' % table
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^?]+)(\?set_encoding=(?P<charset>\w+))?$')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -2295,7 +2303,7 @@ class MySQLAdapter(BaseAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^?]+)(\?set_encoding=(?P<charset>\w+))?$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, \
                 "Invalid URI string in DAL: %s" % self.uri
@@ -2371,9 +2379,9 @@ class PostgreSQLAdapter(BaseAdapter):
         if self.driver_name == 'psycopg2':
             return psycopg2_adapt(obj).getquoted()
         elif self.driver_name == 'pg8000':
-            return str(obj).replace("%","%%").replace("'","''")
+            return "'%s'" % str(obj).replace("%","%%").replace("'","''")
         else:
-            return str(obj).replace("'","''")
+            return "'%s'" % str(obj).replace("'","''")
 
     def sequence_name(self,table):
         return '%s_id_Seq' % table
@@ -2407,6 +2415,8 @@ class PostgreSQLAdapter(BaseAdapter):
         #              % (table._tablename, table._fieldname, table._sequence_name))
         self.execute(query)
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:@]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?sslmode=(?P<sslmode>.+))?$')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}, srid=4326):
@@ -2420,7 +2430,7 @@ class PostgreSQLAdapter(BaseAdapter):
         self.srid = srid
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:@]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?sslmode=(?P<sslmode>.+))?$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, "Invalid URI string in DAL"
         user = credential_decoder(m.group('user'))
@@ -2631,6 +2641,8 @@ class NewPostgreSQLAdapter(PostgreSQLAdapter):
 class JDBCPostgreSQLAdapter(PostgreSQLAdapter):
     drivers = ('zxJDBC',)
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>.+)$')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -2643,7 +2655,7 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>.+)$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, "Invalid URI string in DAL"
         user = credential_decoder(m.group('user'))
@@ -2778,6 +2790,7 @@ class OracleAdapter(BaseAdapter):
     def after_connection(self):
         self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';")
         self.execute("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS';")
+
     oracle_fix = re.compile("[^']*('[^']*'[^']*)*\:(?P<clob>CLOB\('([^']+|'')*'\))")
 
     def execute(self, command, args=None):
@@ -2905,6 +2918,10 @@ class MSSQLAdapter(BaseAdapter):
                 return '0'
         return None
 
+    REGEX_DSN = re.compile('^(?P<dsn>.+)$')
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?(?P<urlargs>.*))?$')
+    REGEX_ARGPATTERN = re.compile('(?P<argkey>[^=]+)=(?P<argvalue>[^&]*)')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                     adapter_args={}, fake_connect=False, srid=4326):
@@ -2921,7 +2938,7 @@ class MSSQLAdapter(BaseAdapter):
         ruri = uri.split('://',1)[1]
         if '@' not in ruri:
             try:
-                m = re.compile('^(?P<dsn>.+)$').match(ruri)
+                m = self.REGEX_DSN.match(ruri)
                 if not m:
                     raise SyntaxError, \
                         'Parsing uri string(%s) has no result' % self.uri
@@ -2934,7 +2951,7 @@ class MSSQLAdapter(BaseAdapter):
             # was cnxn = 'DSN=%s' % dsn
             cnxn = dsn
         else:
-            m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?(?P<urlargs>.*))?$').match(ruri)
+            m = self.REGEX_URI.match(ruri)
             if not m:
                 raise SyntaxError, \
                     "Invalid URI string in DAL: %s" % self.uri
@@ -2956,8 +2973,7 @@ class MSSQLAdapter(BaseAdapter):
             # Default values (drivers like FreeTDS insist on uppercase parameter keys)
             argsdict = { 'DRIVER':'{SQL Server}' }
             urlargs = m.group('urlargs') or ''            
-            argpattern = re.compile('(?P<argkey>[^=]+)=(?P<argvalue>[^&]*)')
-            for argmatch in argpattern.finditer(urlargs):
+            for argmatch in self.REGEX_ARGPATTERN.finditer(urlargs):
                 argsdict[str(argmatch.group('argkey')).upper()] = argmatch.group('argvalue')
             urlargs = ';'.join(['%s=%s' % (ak, av) for (ak, av) in argsdict.iteritems()])
             cnxn = 'SERVER=%s;PORT=%s;DATABASE=%s;UID=%s;PWD=%s;%s' \
@@ -3117,7 +3133,7 @@ class SybaseAdapter(MSSQLAdapter):
         ruri = uri.split('://',1)[1]
         if '@' not in ruri:
             try:
-                m = re.compile('^(?P<dsn>.+)$').match(ruri)
+                m = self.REGEX_DSN.match(ruri)
                 if not m:
                     raise SyntaxError, \
                         'Parsing uri string(%s) has no result' % self.uri
@@ -3128,7 +3144,7 @@ class SybaseAdapter(MSSQLAdapter):
                 logger.error('NdGpatch error')
                 raise e
         else:
-            m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?(?P<urlargs>.*))?$').match(ruri)
+            m = self.REGEX_URI.match(uri)            
             if not m:
                 raise SyntaxError, \
                     "Invalid URI string in DAL: %s" % self.uri
@@ -3220,6 +3236,8 @@ class FireBirdAdapter(BaseAdapter):
         return ['DELETE FROM %s;' % table._tablename,
                 'SET GENERATOR %s TO 0;' % table._sequence_name]
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>.+?)(\?set_encoding=(?P<charset>\w+))?$')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}): 
@@ -3232,7 +3250,7 @@ class FireBirdAdapter(BaseAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>.+?)(\?set_encoding=(?P<charset>\w+))?$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, "Invalid URI string in DAL: %s" % self.uri
         user = credential_decoder(m.group('user'))
@@ -3277,6 +3295,8 @@ class FireBirdAdapter(BaseAdapter):
 class FireBirdEmbeddedAdapter(FireBirdAdapter):
     drivers = ('kinterbasdb','firebirdsql','fdb','pyodbc')
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<path>[^\?]+)(\?set_encoding=(?P<charset>\w+))?$')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -3289,7 +3309,7 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<path>[^\?]+)(\?set_encoding=(?P<charset>\w+))?$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, \
                 "Invalid URI string in DAL: %s" % self.uri
@@ -3383,6 +3403,8 @@ class InformixAdapter(BaseAdapter):
             return "to_date('%s','%%Y-%%m-%%d %%H:%%M:%%S')" % obj
         return None
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>.+)$')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -3395,7 +3417,7 @@ class InformixAdapter(BaseAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>.+)$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, \
                 "Invalid URI string in DAL: %s" % self.uri
@@ -3584,7 +3606,7 @@ INGRES_SEQNAME='ii***lineitemsequence' # NOTE invalid database object name
                                        # to be a delimited identifier)
 
 class IngresAdapter(BaseAdapter):
-    drivers = ('ingredbi',)
+    drivers = ('ingresdbi',)
 
     types = {
         'boolean': 'CHAR(1)',
@@ -3762,6 +3784,9 @@ class SAPDBAdapter(BaseAdapter):
                          % (table._tablename, table._id.name, table._sequence_name))
         self.execute(query)
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:@]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?sslmode=(?P<sslmode>.+))?$')
+
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -3774,7 +3799,7 @@ class SAPDBAdapter(BaseAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:@]+)(\:(?P<port>[0-9]+))?/(?P<db>[^\?]+)(\?sslmode=(?P<sslmode>.+))?$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, "Invalid URI string in DAL"
         user = credential_decoder(m.group('user'))
@@ -3803,6 +3828,8 @@ class SAPDBAdapter(BaseAdapter):
 class CubridAdapter(MySQLAdapter):
     drivers = ('cubriddb',)
 
+    REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^?]+)(\?set_encoding=(?P<charset>\w+))?$')
+
     def __init__(self, db, uri, pool_size=0, folder=None, db_codec='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -3815,7 +3842,7 @@ class CubridAdapter(MySQLAdapter):
         self.db_codec = db_codec
         self.find_or_make_work_folder()
         ruri = uri.split('://',1)[1]
-        m = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^?]+)(\?set_encoding=(?P<charset>\w+))?$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, \
                 "Invalid URI string in DAL: %s" % self.uri
@@ -3934,6 +3961,8 @@ class UseDatabaseStoredFile:
 class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter):
     uploads_in_blob = True
 
+    REGEX_URI = re.compile('^(?P<instance>.*)/(?P<db>.*)$')
+
     def __init__(self, db, uri='google:sql://realm:domain/database',
                  pool_size=0, folder=None, db_codec='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
@@ -3947,7 +3976,7 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter):
         self.folder = folder or pjoin('$HOME',thread.folder.split(
                 os.sep+'applications'+os.sep,1)[1])
         ruri = uri.split("://")[1]
-        m = re.compile('^(?P<instance>.*)/(?P<db>.*)$').match(ruri)
+        m = self.REGEX_URI.match(ruri)
         if not m:
             raise SyntaxError, "Invalid URI string in SQLDB: %s" % self.uri
         instance = credential_decoder(m.group('instance'))
@@ -4143,6 +4172,8 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
     def file_open(self, filename, mode='rb', lock=True): pass
     def file_close(self, fileobj): pass
 
+    REGEX_NAMESPACE = re.compile('.*://(?P<namespace>.+)')
+
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=IDENTITY, driver_args={},
                  adapter_args={}):
@@ -4174,7 +4205,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
         db['_lastsql'] = ''
         self.db_codec = 'UTF-8'
         self.pool_size = 0
-        match = re.compile('.*://(?P<namespace>.+)').match(uri)
+        match = self.REGEX_NAMESPACE.match(uri)
         if match:
             namespace_manager.set_namespace(match.group('namespace'))
 
@@ -4734,11 +4765,8 @@ def cleanup(text):
     """
     validates that the given text is clean: only contains [0-9a-zA-Z_]
     """
-
-    if re.compile('[^0-9a-zA-Z_]').findall(text):
-        raise SyntaxError, \
-            'only [0-9a-zA-Z_] allowed in table and field names, received %s' \
-            % text
+    if not REGEX_ALPHANUMERIC.match(text):
+        raise SyntaxError, 'invalid table or field name: %s' % text
     return text
 
 class MongoDBAdapter(NoSQLAdapter):
@@ -5474,6 +5502,8 @@ class IMAPAdapter(NoSQLAdapter):
 
     dbengine = 'imap'
 
+    REGEX_URI = re.compile('^(?P<user>[^:]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:@]+)(\:(?P<port>[0-9]+))?$')
+
     def __init__(self,
                  db,
                  uri,
@@ -5521,7 +5551,7 @@ class IMAPAdapter(NoSQLAdapter):
 
         db['_lastsql'] = ''
 
-        m = re.compile('^(?P<user>[^:]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:@]+)(\:(?P<port>[0-9]+))?$').match(uri)
+        m = self.REGEX_URI.match(uri)
         user = m.group('user')
         password = m.group('password')
         host = m.group('host')
@@ -6364,7 +6394,8 @@ def bar_decode_integer(value):
     return [int(x) for x in value.split('|') if x.strip()]
 
 def bar_decode_string(value):
-    return [x.replace('||', '|') for x in string_unpack.split(value[1:-1]) if x.strip()]
+    return [x.replace('||', '|') for x in
+            REGEX_UNPACK.split(value[1:-1]) if x.strip()]
 
 
 class Row(object):
@@ -6379,7 +6410,7 @@ class Row(object):
 
     def __getitem__(self, key):
         key=str(key)
-        m = regex_table_field.match(key)
+        m = REGEX_TABLE_DOT_FIELD.match(key)
         if key in self.get('_extra',{}):
             return self._extra[key]
         elif m:
@@ -6429,7 +6460,7 @@ class Row(object):
         return '<Row %s>' % self.__dict__
 
     def __int__(self):
-        return dict.__getitem__(self,'id')
+        return object.__getattribute__(self,'id')
 
     def __eq__(self,other):
         try:
@@ -6506,11 +6537,10 @@ def smart_query(fields,text):
         n = str(field).lower()
         if not n in field_map:
             field_map[n] = field
-    re_constants = re.compile('(\"[^\"]*?\")|(\'[^\']*?\')')
     constants = {}
     i = 0
     while True:
-        m = re_constants.search(text)
+        m = REGEX_CONST_STRING.search(text)
         if not m: break
         text = text[:m.start()]+('#%i' % i)+text[m.end():]
         constants[str(i)] = m.group()[1:-1]
@@ -6720,7 +6750,7 @@ class DAL(object):
                     try:
                         if is_jdbc and not uri.startswith('jdbc:'):
                             uri = 'jdbc:'+uri
-                        self._dbname = regex_dbname.match(uri).group()
+                        self._dbname = REGEX_DBNAME.match(uri).group()
                         if not self._dbname in ADAPTERS:
                             raise SyntaxError, "Error in URI '%s' or database not supported" % self._dbname
                         # notice that driver args or {} else driver_args
@@ -6833,8 +6863,8 @@ def index():
         """
 
         db = self
-        re1 = re.compile('^{[^\.]+\.[^\.]+(\.(lt|gt|le|ge|eq|ne|contains|startswith|year|month|day|hour|minute|second))?(\.not)?}$')
-        re2 = re.compile('^.+\[.+\]$')
+        re1 = REGEX_SEARCH_PATTERN
+        re2 = REGEX_SQUARE_BRACKETS
 
         def auto_table(table,base='',depth=0):
             patterns = []
@@ -7037,7 +7067,7 @@ def index():
         if not isinstance(tablename,str):
             raise SyntaxError, "missing table name"
         elif tablename.startswith('_') or hasattr(self,tablename) or \
-                regex_python_keywords.match(tablename):
+                REGEX_PYTHON_KEYWORDS.match(tablename):
             raise SyntaxError, 'invalid table name: %s' % tablename
         elif tablename in self.tables:
             raise SyntaxError, 'table already defined: %s' % tablename
@@ -7168,21 +7198,34 @@ def index():
 
         [{field1: value1, field2: value2}, {field1: value1b, field2: value2b}]
 
-        Added 2012-08-24 "fields" optional argument. If not None, the
-        results cursor returned by the DB driver will be converted to a
-        DAL Rows object using the db._adapter.parse() method. This requires
-        specifying the "fields" argument as a list of DAL Field objects
-        that match the fields returned from the DB. The Field objects should
-        be part of one or more Table objects defined on the DAL object.
-        The "fields" list can include one or more DAL Table objects in addition
-        to or instead of including Field objects, or it can be just a single
-        table (not in a list). In that case, the Field objects will be
-        extracted from the table(s).
+        Added 2012-08-24 "fields" and "colnames" optional arguments. If either
+        is provided, the results cursor returned by the DB driver will be
+        converted to a DAL Rows object using the db._adapter.parse() method.
         
-        The field names will be extracted from the Field objects, or optionally,
-        a list of field names can be provided (in tablename.fieldname format)
-        via the "colnames" argument. Note, the fields and colnames must be in
-        the same order as the fields in the results cursor returned from the DB.
+        The "fields" argument is a list of DAL Field objects that match the
+        fields returned from the DB. The Field objects should be part of one or
+        more Table objects defined on the DAL object. The "fields" list can
+        include one or more DAL Table objects in addition to or instead of
+        including Field objects, or it can be just a single table (not in a
+        list). In that case, the Field objects will be extracted from the
+        table(s).
+
+        Instead of specifying the "fields" argument, the "colnames" argument
+        can be specified as a list of field names in tablename.fieldname format.
+        Again, these should represent tables and fields defined on the DAL
+        object.
+        
+        It is also possible to specify both "fields" and the associated
+        "colnames". In that case, "fields" can also include DAL Expression
+        objects in addition to Field objects. For Field objects in "fields",
+        the associated "colnames" must still be in tablename.fieldname format.
+        For Expression objects in "fields", the associated "colnames" can
+        be any arbitrary labels.
+        
+        Note, the DAL Table objects referred to by "fields" or "colnames" can
+        be dummy tables and do not have to represent any real tables in the
+        database. Also, note that the "fields" and "colnames" must be in the
+        same order as the fields in the results cursor returned from the DB.
         """
         adapter = self._adapter
         if placeholders:
@@ -7203,8 +7246,12 @@ def index():
             # convert the list for each row into a dictionary so it's
             # easier to work with. row['field_name'] rather than row[0]
             return [dict(zip(fields,row)) for row in data]
+        try:
             data = adapter.cursor.fetchall()
-        if fields:
+        except:
+            return None
+        if fields or colnames:
+            fields = [] if fields is None else fields
             if not isinstance(fields, list):
                 fields = [fields]
             extracted_fields = []
@@ -8140,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)
@@ -8348,7 +8395,7 @@ class Field(Expression):
         self.second = None
         self.name = fieldname = cleanup(fieldname)
         if not isinstance(fieldname,str) or hasattr(Table,fieldname) or \
-                fieldname[0] == '_' or regex_python_keywords.match(fieldname):
+                fieldname[0] == '_' or REGEX_PYTHON_KEYWORDS.match(fieldname):
             raise SyntaxError, 'Field: invalid field name: %s' % fieldname
         self.type = type if not isinstance(type, Table) else 'reference %s' % type
         self.length = length if not length is None else DEFAULTLENGTH.get(self.type,512)
@@ -8403,7 +8450,7 @@ class Field(Expression):
             filename = file.name
         filename = os.path.basename(filename.replace('/', os.sep)\
                                         .replace('\\', os.sep))        
-        m = re.compile('\.(?P<e>\w{1,5})$').search(filename)
+        m = REGEX_STORE_PATTERN.search(filename)
         extension = m and m.group('e') or 'txt'
         uuid_key = web2py_uuid().replace('-', '')[-16:]
         encoded_filename = base64.b16encode(filename).lower()
@@ -8456,7 +8503,7 @@ class Field(Expression):
                 raise http.HTTP(404)
         if self.authorize and not self.authorize(row):
             raise http.HTTP(403)
-        m = regex_content.match(name)
+        m = REGEX_UPLOAD_PATTERN.match(name)
         if not m or not self.isattachment:
             raise TypeError, 'Can\'t retrieve %s' % name
         file_properties = self.retrieve_file_properties(name,path)
@@ -8481,11 +8528,11 @@ class Field(Expression):
         if self.custom_retrieve_file_properties:
             return self.custom_retrieve_file_properties(name, path)
         try:
-            m = regex_content.match(name)
+            m = REGEX_UPLOAD_PATTERN.match(name)
             if not m or not self.isattachment:
                 raise TypeError, 'Can\'t retrieve %s file properties' % name
             filename = base64.b16decode(m.group('name'), True)
-            filename = regex_cleanup_fn.sub('_', filename)
+            filename = REGEX_CLEANUP_FN.sub('_', filename)
         except (TypeError, AttributeError):
             filename = name
         if isinstance(self_uploadfield, str):  # ## if file is in DB
@@ -8595,7 +8642,6 @@ class Query(object):
         return Query(self.db,self.db._adapter.NOT,self)
 
 
-regex_quotes = re.compile("'[^']*'")
 
 
 def xorify(orderby):
@@ -9104,7 +9150,7 @@ class Rows(object):
         for record in self:
             row = []
             for col in colnames:
-                if not regex_table_field.match(col):
+                if not REGEX_TABLE_DOT_FIELD.match(col):
                     row.append(record._extra[col])
                 else:
                     (t, f) = col.split('.')
@@ -9124,7 +9170,6 @@ class Rows(object):
         """
         serializes the table using sqlhtml.SQLTABLE (if present)
         """        
-        alphanumeric = re.compile('[a-zA-Z]\w*')
         if strict:
             ncols = len(self.colnames)
             def f(row,field,indent='  '):
@@ -9138,9 +9183,8 @@ class Rows(object):
                         indent,
                         field)
                 elif not callable(row):
-                    if alphanumeric.match(field):
-                        return '%s<%s>%s</%s>' % \
-                            (indent,field,row,field)
+                    if REGEX_ALPHANUMERIC.match(field):
+                        return '%s<%s>%s</%s>' % (indent,field,row,field)
                     else:
                         return '%s<extra name="%s">%s</extra>' % \
                             (indent,field,row)
@@ -9164,7 +9208,7 @@ class Rows(object):
         def inner_loop(record, col):
             (t, f) = col.split('.')
             res = None
-            if not regex_table_field.match(col):
+            if not REGEX_TABLE_DOT_FIELD.match(col):
                 key = col
                 res = record._extra[col]
             else:

gluon/languages.py

@@ -800,8 +800,8 @@ def findT(path, language='en'):
     """
     must be run by the admin app
     """
-    filename = ospath.join(path, 'languages', language + '.py')
-    sentences = read_dict(filename)
+    lang_file = ospath.join(path, 'languages', language + '.py')
+    sentences = read_dict(lang_file)
     mp = ospath.join(path, 'models')
     cp = ospath.join(path, 'controllers')
     vp = ospath.join(path, 'views')
@@ -830,8 +830,9 @@ def findT(path, language='en'):
             'en' if language in ('default', 'en') else language)
     if not '!langname!' in sentences:
         sentences['!langname!'] = (
-            'English' if language in ('default', 'en') else sentences['!langcode!'])
-    write_dict(filename, sentences)
+            'English' if language in ('default', 'en')
+            else sentences['!langcode!'])
+    write_dict(lang_file, sentences)
 
 ### important to allow safe session.flash=T(....)
 def lazyT_unpickle(data):

gluon/main.py

@@ -91,7 +91,8 @@ from validators import CRYPT
 from cache import Cache
 from html import URL, xmlescape
 from utils import is_valid_ip_address
-from rewrite import load, url_in, thread as rwthread, try_rewrite_on_error
+from rewrite import load, url_in, thread as rwthread, \
+    try_rewrite_on_error, fixup_missing_path_info
 import newcron
 
 __all__ = ['wsgibase', 'save_password', 'appfactory', 'HttpServer']
@@ -148,10 +149,11 @@ def copystream_progress(request, chunk_size= 10**5):
     and stores progress upload status in cache.ram
     X-Progress-ID:length and X-Progress-ID:uploaded
     """
-    if not request.env.content_length:
+    env = request.env
+    if not env.content_length:
         return cStringIO.StringIO()
-    source = request.env.wsgi_input
-    size = int(request.env.content_length)
+    source = env.wsgi_input
+    size = int(env.content_length)
     dest = tempfile.TemporaryFile()
     if not 'X-Progress-ID' in request.vars:
         copystream(source, dest, size, chunk_size)
@@ -274,7 +276,8 @@ def environ_aux(environ,request):
 def parse_get_post_vars(request, environ):
 
     # always parse variables in URL for GET, POST, PUT, DELETE, etc. in get_vars
-    dget = cgi.parse_qsl(request.env.query_string or '', keep_blank_values=1)
+    env = request.env
+    dget = cgi.parse_qsl(env.query_string or '', keep_blank_values=1)
     for (key, value) in dget:
         if key in request.get_vars:
             if isinstance(request.get_vars[key], list):
@@ -290,7 +293,7 @@ def parse_get_post_vars(request, environ):
         request.body = body = copystream_progress(request)
     except IOError:
         raise HTTP(400,"Bad Request - HTTP body is incomplete")
-    if (body and request.env.request_method in ('POST', 'PUT', 'BOTH')):
+    if (body and env.request_method in ('POST', 'PUT', 'BOTH')):
         dpost = cgi.FieldStorage(fp=body,environ=environ,keep_blank_values=1)
         # The same detection used by FieldStorage to detect multipart POSTs
         is_multipart = dpost.type[:10] == 'multipart/'
@@ -382,26 +385,7 @@ def wsgibase(environ, responder):
                 # serve file if static
                 # ##################################################
 
-                eget = environ.get
-                if not eget('PATH_INFO') and eget('REQUEST_URI'):
-                    # for fcgi, get path_info and 
-                    # query_string from request_uri
-                    items = environ['REQUEST_URI'].split('?')
-                    environ['PATH_INFO'] = items[0]
-                    if len(items) > 1:
-                        environ['QUERY_STRING'] = items[1]
-                    else:
-                        environ['QUERY_STRING'] = ''
-                elif not eget('REQUEST_URI'):
-                    if eget('QUERY_STRING'):
-                        environ['REQUEST_URI'] = eget('PATH_INFO') + '?' + eget('QUERY_STRING')
-                    else:
-                        environ['REQUEST_URI'] = eget('PATH_INFO')
-                if not eget('HTTP_HOST'):
-                    environ['HTTP_HOST'] = \
-                        eget('SERVER_NAME') + ':' + eget('SERVER_PORT')
-                    
-
+                fixup_missing_path_info(environ)
                 (static_file, environ) = url_in(request, environ)
 
                 if static_file:
@@ -438,6 +422,7 @@ def wsgibase(environ, responder):
                     is_https = env.wsgi_url_scheme \
                         in ['https', 'HTTPS'] or env.https=='on')
                 request.uuid = request.compute_uuid() # requires client
+                request.url = environ['PATH_INFO']
 
                 # ##################################################
                 # access the requested application
@@ -460,9 +445,6 @@ def wsgibase(environ, responder):
                 elif not request.is_local and \
                         exists(pjoin(request.folder,'DISABLED')):
                     raise HTTP(503, "<html><body><h1>Temporarily down for maintenance</h1></body></html>")
-                request.url = URL(r=request,
-                                  args=request.args,
-                                  extension=request.raw_extension)
 
                 # ##################################################
                 # build missing folders
@@ -492,9 +474,9 @@ def wsgibase(environ, responder):
                 # load cookies
                 # ##################################################
 
-                if request.env.http_cookie:
+                if env.http_cookie:
                     try:
-                        request.cookies.load(request.env.http_cookie)
+                        request.cookies.load(env.http_cookie)
                     except Cookie.CookieError, e:
                         pass # invalid cookies
 
@@ -502,6 +484,7 @@ def wsgibase(environ, responder):
                 # try load session or create new session file
                 # ##################################################
 
+                if not env.web2py_disable_session:
                     session.connect(request, response)
 
                 # ##################################################
@@ -566,7 +549,7 @@ def wsgibase(environ, responder):
                 # ##################################################
 
                 if request.cid:
-                    rheaders = response.headers
+                    rheaders = http_response.headers
                     if response.flash and \
                             not 'web2py-component-flash' in rheaders:
                         rheaders['web2py-component-flash'] = \

gluon/rewrite.py

@@ -38,6 +38,7 @@ thread = threading.local()  # thread-local storage for routing params
 regex_at = re.compile(r'(?<!\\)\$[a-zA-Z]\w*')
 regex_anything = re.compile(r'(?<!\\)\$anything')
 regex_redirect = re.compile(r'(\d+)->(.*)')
+regex_full_url = re.compile(r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)')
 
 def _router_default():
     "return new copy of default base router"
@@ -134,6 +135,27 @@ ROUTER_BASE_KEYS = set(
 #  filter_err: helper for doctest & unittest
 #  regex_filter_out: doctest
 
+def fixup_missing_path_info(environ):
+    eget = environ.get
+    path_info = eget('PATH_INFO')
+    request_uri = eget('REQUEST_URI')
+    if not path_info and request_uri:
+        # for fcgi, get path_info and                           
+        # query_string from request_uri                         
+        items = request_uri.split('?')
+        path_info = environ['PATH_INFO'] = items[0]
+        environ['QUERY_STRING'] = items[1] if len(items) > 1 else ''
+    elif not request_uri:
+        query_string = eget('QUERY_STRING')
+        if query_string:
+            environ['REQUEST_URI'] = '%s?%s' % (path_info,query_string)
+        else:
+            environ['REQUEST_URI'] = path_info
+    if not eget('HTTP_HOST'):
+        environ['HTTP_HOST'] = \
+            '%s:%s' % (eget('SERVER_NAME'),eget('SERVER_PORT'))
+            
+        
 def url_in(request, environ):
     "parse and rewrite incoming URL"
     if routers:
@@ -286,8 +308,8 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
 
     for sym in ('routes_app', 'routes_in', 'routes_out'):
         if sym in symbols:
-            for (k, v) in symbols[sym]:
-                p[sym].append(compile_regex(k, v))
+            for items in symbols[sym]:
+                p[sym].append(compile_regex(*items))
     for sym in ('routes_onerror', 'routes_apps_raw',
                 'error_handler','error_message', 'error_message_ticket',
                 'default_application','default_controller', 'default_function',
@@ -349,7 +371,7 @@ def load(routes='routes.py', app=None, data=None, rdict=None):
     log_rewrite('URL rewrite is on. configuration in %s' % path)
 
 
-def compile_regex(k, v):
+def compile_regex(k, v, env=None):
     """
     Preprocess and compile the regular expressions in routes_app/in/out
     The resulting regex will match a pattern of the form:
@@ -383,7 +405,7 @@ def compile_regex(k, v):
     # same for replacement pattern, but with \g
     for item in regex_at.findall(v):
         v = v.replace(item, r'\g<%s>' % item[1:])
-    return (re.compile(k, re.DOTALL), v)
+    return (re.compile(k, re.DOTALL), v, env or {})
 
 def load_routers(all_apps):
     "load-time post-processing of routers"
@@ -497,8 +519,9 @@ def regex_uri(e, regexes, tag, default=None):
         (e.get('REMOTE_ADDR','localhost'),
          e.get('wsgi.url_scheme', 'http').lower(), host,
          e.get('REQUEST_METHOD', 'get').lower(), path)
-    for (regex, value) in regexes:
+    for (regex, value, custom_env) in regexes:
         if regex.match(key):
+            e.update(custom_env)
             rewritten = regex.sub(value, key)
             log_rewrite('%s: [%s] [%s] -> %s' % (tag, key, value, rewritten))
             return rewritten
@@ -686,7 +709,7 @@ def regex_filter_out(url, e=None):
                   e.get('request_method', 'get').lower(), items[0])
         else:
             items[0] = ':http://localhost:get %s' % items[0]
-        for (regex, value) in thread.routes.routes_out:
+        for (regex, value, tmp) in thread.routes.routes_out:
             if regex.match(items[0]):
                 rewritten = '?'.join([regex.sub(value, items[0])] + items[1:])
                 log_rewrite('routes_out: [%s] -> %s' % (url, rewritten))
@@ -695,11 +718,14 @@ def regex_filter_out(url, e=None):
     return url
 
 
-def filter_url(url, method='get', remote='0.0.0.0', out=False, app=False, lang=None,
-        domain=(None,None), env=False, scheme=None, host=None, port=None):
-    "doctest/unittest interface to regex_filter_in() and regex_filter_out()"
-    regex_url = re.compile(r'^(?P<scheme>http|https|HTTP|HTTPS)\://(?P<host>[^/]*)(?P<uri>.*)')
-    match = regex_url.match(url)
+def filter_url(url, method='get', remote='0.0.0.0', 
+               out=False, app=False, lang=None,
+               domain=(None,None), env=False, scheme=None, 
+               host=None, port=None):
+    """
+    doctest/unittest interface to regex_filter_in() and regex_filter_out()
+    """
+    match = regex_full_url.match(url)
     urlscheme = match.group('scheme').lower()
     urlhost = match.group('host').lower()
     uri = match.group('uri')

gluon/scheduler.py

@@ -88,7 +88,7 @@ except:
     from simplejson import loads, dumps
 
 
-from gluon import DAL, Field, IS_NOT_EMPTY, IS_IN_SET, IS_NOT_IN_DB
+from gluon import DAL, Field, IS_NOT_EMPTY, IS_IN_SET, IS_NOT_IN_DB, IS_INT_IN_RANGE
 from gluon.utils import web2py_uuid
 
 
@@ -454,15 +454,20 @@ class Scheduler(MetaScheduler):
             Field('args','text',default='[]',requires=TYPE(list)),
             Field('vars','text',default='{}',requires=TYPE(dict)),
             Field('enabled','boolean',default=True),
-            Field('start_time','datetime',default=now),
+            Field('start_time','datetime',default=now, requires=IS_NOT_EMPTY()),
             Field('next_run_time','datetime',default=now),
             Field('stop_time','datetime'),
-            Field('repeats','integer',default=1,comment="0=unlimited"),
-            Field('retry_failed', 'integer', default=0, comment="-1=unlimited"),
-            Field('period','integer',default=60,comment='seconds'),
-            Field('timeout','integer',default=60,comment='seconds'),
+            Field('repeats','integer',default=1,comment="0=unlimited",
+                  requires=IS_INT_IN_RANGE(0, None)),
+            Field('retry_failed', 'integer', default=0, comment="-1=unlimited",
+                  requires=IS_INT_IN_RANGE(-1, None)),
+            Field('period','integer',default=60,comment='seconds',
+                  requires=IS_INT_IN_RANGE(0, None)),
+            Field('timeout','integer',default=60,comment='seconds',
+                  requires=IS_INT_IN_RANGE(0, None)),
             Field('sync_output', 'integer', default=0,
-                  comment="update output every n sec: 0=never"),
+                  comment="update output every n sec: 0=never",
+                  requires=IS_INT_IN_RANGE(0, None)),
             Field('times_run','integer',default=0,writable=False),
             Field('times_failed','integer',default=0,writable=False),
             Field('last_run_time','datetime',writable=False,readable=False),
@@ -870,4 +875,3 @@ def main():
 
 if __name__=='__main__':
     main()
-

gluon/sqlhtml.py

@@ -24,7 +24,7 @@ from html import FORM, INPUT, LABEL, OPTION, SELECT, BUTTON
 from html import TABLE, THEAD, TBODY, TR, TD, TH, STYLE
 from html import URL, truncate_string, FIELDSET
 from dal import DAL, Field, Table, Row, CALLABLETYPES, smart_query, \
-    bar_encode, regex_table_field, Reference
+    bar_encode, Reference, REGEX_TABLE_DOT_FIELD
 from storage import Storage
 from utils import md5_hash
 from validators import IS_EMPTY_OR, IS_NOT_EMPTY, IS_LIST_OF, IS_DATE, \
@@ -702,17 +702,17 @@ def formstyle_bootstrap(form, fields):
         _submit = False
 
         if isinstance(controls, INPUT):
-            controls['_class'] = 'input-xlarge'
+            controls.add_class('input-xlarge')
             if controls['_type'] == 'submit':
                 # flag submit button
                 _submit = True
                 controls['_class'] = 'btn btn-primary'
 
         if isinstance(controls, SELECT):
-            controls['_class'] = 'input-xlarge'
+            controls.add_class('input-xlarge')
 
         if isinstance(controls, TEXTAREA):
-            controls['_class'] = 'input-xlarge'
+            controls.add_class('input-xlarge')
 
         if isinstance(label, LABEL):
             label['_class'] = 'control-label'
@@ -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 (
-                    ignore_rw or f.writable or f.readable) and not f.compute]
+            fields = [f.name for f in table if 
+                      (ignore_rw or f.writable or f.readable) and 
+                      (readonly or not f.compute)]
         self.fields = fields
 
         # make sure we have an id
@@ -1376,8 +1377,8 @@ class SQLFORM(FORM):
                 # this should never happen but seems to happen to some
                 del fields['delete_this_record']
             for field in self.table:
-                if not field.name in fields and field.writable==False \
-                        and field.update is None:
+                if not field.name in fields and field.writable is False \
+                        and field.update is None and field.compute is None:
                     if record_id and self.record:
                         fields[field.name] = self.record[field.name]
                     elif not self.table[field.name].default is None:
@@ -1498,11 +1499,10 @@ class SQLFORM(FORM):
         selectfields = []
         for field in fields:
             name = str(field).replace('.','-')
-            criterion = []
             options = search_options.get(field.type,None)
             if options:
                 label = isinstance(field.label,str) and T(field.label) or field.label
-                selectfields.append((str(field),label))
+                selectfields.append(OPTION(label, _value=str(field)))
                 operators = SELECT(*[T(option) for option in options])
                 if field.type=='boolean':
                     value_input = SELECT(
@@ -1510,28 +1510,37 @@ class SQLFORM(FORM):
                         OPTION(T("False"),_value="F"),
                         _id="w2p_value_"+name)
                 else:
-                    value_input = INPUT(_type='text',_id="w2p_value_"+name,
+                    value_input = INPUT(_type='text',
+                                        _id="w2p_value_"+name,
                                         _class=field.type)
                 new_button = INPUT(
                     _type="button", _value=T('New'),_class="btn",
-                        _onclick="w2p_build_query('new','"+str(field)+"')")
+                    _onclick="w2p_build_query('new','%s')" % field)
                 and_button = INPUT(
                     _type="button", _value=T('And'),_class="btn",
-                    _onclick="w2p_build_query('and','"+str(field)+"')")
+                    _onclick="w2p_build_query('and','%s')" % field)
                 or_button = INPUT(
                     _type="button", _value=T('Or'),_class="btn",
-                    _onclick="w2p_build_query('or','"+str(field)+"')")
+                    _onclick="w2p_build_query('or','%s')" % field)
+                close_button = INPUT(
+                    _type="button", _value=T('Close'),_class="btn",
+                    _onclick="jQuery('#w2p_query_panel').slideUp()")
+
+                criteria.append(DIV(
+                        operators,value_input,new_button,
+                        and_button,or_button,close_button,
+                        _id='w2p_field_%s' % name,
+                        _class='w2p_query_row hidden',
+                        _style='display:inline'))
                                 
-                criterion.extend([operators,value_input,new_button,and_button,or_button])
-            criteria.append(DIV(criterion, _id='w2p_field_%s' % name,
-                                _class='w2p_query_row hidden'))
         criteria.insert(0,SELECT(
                 _id="w2p_query_fields",
                 _onchange="jQuery('.w2p_query_row').hide();jQuery('#w2p_field_'+jQuery('#w2p_query_fields').val().replace('.','-')).show();",
-                *[OPTION(label, _value=fname) for fname,label in selectfields]))
+                _style='float:left',
+                *selectfields))
+
         fadd = SCRIPT("""
-        jQuery('#w2p_query_panel input,#w2p_query_panel select').css(
-               'width','auto').css('float','left');
+        jQuery('#w2p_query_panel input,#w2p_query_panel select').css('width','auto');
         jQuery(function(){web2py_ajax_fields('#w2p_query_panel');});
         function w2p_build_query(aggregator,a) {
           var b=a.replace('.','-');
@@ -1541,10 +1550,11 @@ class SQLFORM(FORM):
           var k=jQuery('#web2py_keywords');
           var v=k.val();
           if(aggregator=='new') k.val(s); else k.val((v?(v+' '+ aggregator +' '):'')+s);
-          jQuery('#w2p_query_panel').slideUp();
         }
         """)
-        return CAT(DIV(_id="w2p_query_panel",_class='hidden',*criteria),fadd)
+        return CAT(
+            DIV(_id="w2p_query_panel",_class='hidden',*criteria),fadd)
+                       
 
 
     @staticmethod
@@ -1664,7 +1674,8 @@ class SQLFORM(FORM):
                 redirect(referrer)
 
         def gridbutton(buttonclass='buttonadd', buttontext='Add',
-                       buttonurl=url(args=[]),callback=None,delete=None,trap=True):
+                       buttonurl=url(args=[]), callback=None,
+                       delete=None, trap=True):
             if showbuttontext:
                 if callback:
                     return A(SPAN(_class=ui.get(buttonclass)),
@@ -1854,12 +1865,6 @@ class SQLFORM(FORM):
 
         session['_web2py_grid_referrer_'+formname] = url2(vars=request.vars)
         console = DIV(_class='web2py_console %(header)s %(cornertop)s' % ui)
-        if create:
-            console.append(gridbutton(
-                    buttonclass='buttonadd',
-                    buttontext='Add',
-                    buttonurl=url(args=['new',tablename])))
-
         error = None
         if searchable:
             sfields = reduce(lambda a,b:a+b,
@@ -1868,13 +1873,13 @@ class SQLFORM(FORM):
                 search_widget = search_widget[tablename]
             if search_widget=='default':
                 search_menu = SQLFORM.search_menu(sfields)
-                search_widget = lambda sfield, url: FORM(
+                search_widget = lambda sfield, url: DIV(FORM(
                     INPUT(_name='keywords',_value=request.vars.keywords,
                           _id='web2py_keywords',_onfocus="jQuery('#w2p_query_fields').change();jQuery('#w2p_query_panel').slideDown();"),
                     INPUT(_type='submit',_value=T('Search'),_class="btn"),
                     INPUT(_type='submit',_value=T('Clear'),_class="btn",
                           _onclick="jQuery('#web2py_keywords').val('');"),
-                    search_menu,_method="GET",_action=url)
+                    _method="GET",_action=url),search_menu)
             form = search_widget and search_widget(sfields,url()) or ''
             console.append(form)
             keywords = request.vars.get('keywords','')
@@ -1888,6 +1893,12 @@ class SQLFORM(FORM):
                 error = T('Invalid query')
         else:
             subquery = None
+        if create:
+            console.append(gridbutton(
+                    buttonclass='buttonadd',
+                    buttontext='Add',
+                    buttonurl=url(args=['new',tablename])))
+
         if subquery:
             dbset = dbset(subquery)
         try:
@@ -2568,7 +2579,7 @@ class ExportClass(object):
         for record in self.rows:
             row = []
             for col in self.rows.colnames:
-                if not regex_table_field.match(col):
+                if not REGEX_TABLE_DOT_FIELD.match(col):
                     row.append(record._extra[col])
                 else:
                     (t, f) = col.split('.')

gluon/storage.py

@@ -136,7 +136,7 @@ class StorageList(Storage):
     like Storage but missing elements default to [] instead of None
     """
     def __getitem__(self,key):
-        return self.__gteattr__(key)
+        return self.__getattr__(key)
     def __getattr__(self, key):
         if key in self:
             return getattr(self,key)

gluon/tests/test_markmin.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Unit tests for running web2py
+"""
+import sys
+import os
+if os.path.isdir('gluon'):
+    sys.path.append(os.path.realpath('gluon'))
+else:
+    sys.path.append(os.path.realpath('../'))
+
+import unittest
+from gluon.contrib.markmin.markmin2html import run_doctests
+
+class TestMarkmin(unittest.TestCase):
+    def testMarkmin(self):
+        run_doctests()
+
+if __name__ == '__main__':
+    unittest.main()
+

gluon/tools.py

@@ -839,6 +839,7 @@ class Auth(object):
         table_event = None,
         table_cas = None,
         showid = False,
+        use_username = False,
         login_email_validate = True,
         login_userfield = None,
         logout_onlogout = None,
@@ -1060,7 +1061,6 @@ class Auth(object):
         request = current.request
         session = current.session
         auth = session.auth
-        self.use_username = None # None means postpone detection
         self.user_groups = auth and auth.user_groups or {}
         if auth and auth.last_visit and auth.last_visit + \
                 datetime.timedelta(days=0, seconds=auth.expiration) > request.now:
@@ -1251,21 +1251,21 @@ class Auth(object):
         else:
             login = A(T('Login'), _href=href('login'))
             register = A(T('Register'), _href=href('register'))
-            retrieve_username = A(T('Forgot username?'), _href=href('retrieve_username'))
-            lost_password = A(T('Lost password?'), _href=href('request_reset_password'))
+            retrieve_username = A(
+                T('Forgot username?'), _href=href('retrieve_username'))
+            lost_password = A(
+                T('Lost password?'), _href=href('request_reset_password'))
             bar = SPAN(s1, login, s3, _class='auth_navbar')
 
             if not 'register' in self.settings.actions_disabled:
                 bar.insert(-1, s2)
                 bar.insert(-1, register)
-            if self.use_username is None:
-                # should always be false if auth.define_tables() is called
-                self.use_username = 'username' in self.table_user().fields
-            if self.use_username and \
-                    not 'retrieve_username' in self.settings.actions_disabled:
+            if self.settings.use_username and not 'retrieve_username' \
+                    in self.settings.actions_disabled:
                 bar.insert(-1, s2)
                 bar.insert(-1, retrieve_username)
-            if not 'request_reset_password' in self.settings.actions_disabled:
+            if not 'request_reset_password' \
+                    in self.settings.actions_disabled:
                 bar.insert(-1, s2)
                 bar.insert(-1, lost_password)
         return bar
@@ -1357,7 +1357,7 @@ class Auth(object):
                   writable=False,readable=False,
                   label=T('Modified By')))
 
-    def define_tables(self, username=False, signature=None,
+    def define_tables(self, username=None, signature=None,
                       migrate=True, fake_migrate=False):
         """
         to be called unless tables are defined manually
@@ -1375,7 +1375,10 @@ class Auth(object):
 
         db = self.db
         settings = self.settings
-        self.use_username = username
+        if username is None:
+            username = settings.use_username
+        else:
+            settings.use_username = username
         if not self.signature:
             self.define_signature()
         if signature==True:

gluon/validators.py

@@ -1376,6 +1376,7 @@ class IS_GENERIC_URL(Validator):
 
     """
 
+
     def __init__(
         self,
         error_message='enter a valid URL',
@@ -1402,6 +1403,9 @@ class IS_GENERIC_URL(Validator):
                 "prepend_scheme='%s' is not in allowed_schemes=%s" \
                 % (self.prepend_scheme, self.allowed_schemes)
 
+    GENERIC_URL = re.compile(r"%[^0-9A-Fa-f]{2}|%[^0-9A-Fa-f][0-9A-Fa-f]|%[0-9A-Fa-f][^0-9A-Fa-f]|%$|%[0-9A-Fa-f]$|%[^0-9A-Fa-f]$")
+    GENERIC_URL_VALID = re.compile(r"[A-Za-z0-9;/?:@&=+$,\-_\.!~*'\(\)%#]+$")
+
     def __call__(self, value):
         """
         :param value: a string, the URL to validate
@@ -1411,12 +1415,9 @@ class IS_GENERIC_URL(Validator):
         """
         try:
             # if the URL does not misuse the '%' character
-            if not re.compile(
-                r"%[^0-9A-Fa-f]{2}|%[^0-9A-Fa-f][0-9A-Fa-f]|%[0-9A-Fa-f][^0-9A-Fa-f]|%$|%[0-9A-Fa-f]$|%[^0-9A-Fa-f]$"
-                              ).search(value):
+            if not self.GENERIC_URL.search(value):
                 # if the URL is only composed of valid characters
-                if re.compile(
-                    r"[A-Za-z0-9;/?:@&=+$,\-_\.!~*'\(\)%#]+$").match(value):
+                if self.GENERIC_URL_VALID.match(value):
                     # Then split up the URL into its components and check on
                     # the scheme
                     scheme = url_split_regex.match(value).group(2)
@@ -1432,11 +1433,10 @@ class IS_GENERIC_URL(Validator):
                         # ports, check to see if adding a valid scheme fixes
                         # the problem (but only do this if it doesn't have
                         # one already!)
-                        if not re.compile('://').search(value) and None\
-                             in self.allowed_schemes:
+                        if value.find('://')<0 and None in self.allowed_schemes:
                             schemeToUse = self.prepend_scheme or 'http'
-                            prependTest = self.__call__(schemeToUse
-                                     + '://' + value)
+                            prependTest = self.__call__(
+                                schemeToUse + '://' + value)
                             # if the prepend test succeeded
                             if prependTest[1] is None:
                                 # if prepending in the output is enabled
@@ -1791,6 +1791,9 @@ class IS_HTTP_URL(Validator):
 
     """
 
+    GENERIC_VALID_IP = re.compile("([\w.!~*'|;:&=+$,-]+@)?\d+\.\d+\.\d+\.\d+(:\d*)*$")
+    GENERIC_VALID_DOMAIN = re.compile("([\w.!~*'|;:&=+$,-]+@)?(([A-Za-z0-9]+[A-Za-z0-9\-]*[A-Za-z0-9]+\.)*([A-Za-z0-9]+\.)*)*([A-Za-z]+[A-Za-z0-9\-]*[A-Za-z0-9]+)\.?(:\d*)*$")
+
     def __init__(
         self,
         error_message='enter a valid URL',
@@ -1843,16 +1846,12 @@ class IS_HTTP_URL(Validator):
                 # if there is an authority component
                 if authority:
                     # if authority is a valid IP address
-                    if re.compile(
-                        "([\w.!~*'|;:&=+$,-]+@)?\d+\.\d+\.\d+\.\d+(:\d*)*$").match(authority):
+                    if self.GENERIC_VALID_IP.match(authority):
                         # Then this HTTP URL is valid
                         return (value, None)
                     else:
                         # else if authority is a valid domain name
-                        domainMatch = \
-                            re.compile(
-                                "([\w.!~*'|;:&=+$,-]+@)?(([A-Za-z0-9]+[A-Za-z0-9\-]*[A-Za-z0-9]+\.)*([A-Za-z0-9]+\.)*)*([A-Za-z]+[A-Za-z0-9\-]*[A-Za-z0-9]+)\.?(:\d*)*$"
-                                ).match(authority)
+                        domainMatch = self.GENERIC_VALID_DOMAIN.match(authority)
                         if domainMatch:
                             # if the top-level domain really exists
                             if domainMatch.group(5).lower()\
@@ -1865,13 +1864,13 @@ class IS_HTTP_URL(Validator):
                     path = componentsMatch.group(5)
                     # relative case: if this is a valid path (if it starts with
                     # a slash)
-                    if re.compile('/').match(path):
+                    if path.startswith('/'):
                         # Then this HTTP URL is valid
                         return (value, None)
                     else:
                         # abbreviated case: if we haven't already, prepend a
                         # scheme and see if it fixes the problem
-                        if not re.compile('://').search(value):
+                        if value.find('://')<0:
                             schemeToUse = self.prepend_scheme or 'http'
                             prependTest = self.__call__(schemeToUse
                                      + '://' + value)
@@ -2521,9 +2520,11 @@ class CLEANUP(Validator):
 
     removes special characters on validation
     """
+    REGEX_CLEANUP = re.compile('[^\x09\x0a\x0d\x20-\x7e]')
 
-    def __init__(self, regex='[^\x09\x0a\x0d\x20-\x7e]'):
-        self.regex = re.compile(regex)
+    def __init__(self, regex=None):
+        self.regex = self.REGEX_CLEANUP if regex is None \
+            else re.compile(regex)
 
     def __call__(self, value):
         v = self.regex.sub('',str(value).strip())
@@ -2790,11 +2791,13 @@ class IS_STRONG(object):
 
 class IS_IN_SUBSET(IS_IN_SET):
 
+    REGEX_W = re.compile('\w+')
+
     def __init__(self, *a, **b):
         IS_IN_SET.__init__(self, *a, **b)
 
     def __call__(self, value):
-        values = re.compile("\w+").findall(str(value))
+        values = self.REGEX_W.findall(str(value))
         failures = [x for x in values if IS_IN_SET.__call__(self, x)[1]]
         if failures:
             return (value, translate(self.error_message))

scripts/tickets2email.py

@@ -26,10 +26,8 @@ administrator_email = 'you@localhost'
 
 while 1:
     for file in os.listdir(path):
-        filename = os.path.join(path, file)
-
         if not ALLOW_DUPLICATES:
-            fileobj = open(filename, 'r')
+            fileobj = open(file, 'r')
             try:
                 file_data = fileobj.read()
             finally:
@@ -42,10 +40,10 @@ while 1:
             hashes[key] = 1
 
         error = RestrictedError()
-        error.load(request, request.application, filename)
+        error.load(request, request.application, file)
 
         mail.send(to=administrator_email, subject='new web2py ticket', message=error.traceback)
 
-        os.unlink(filename)
+        os.unlink(os.path.join(path, file))
     time.sleep(SLEEP_MINUTES * 60)