minor cleanup

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.2 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
+	echo 'Version 2.0.3 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
@@ -127,5 +127,5 @@ push:
 tag:
 	git tag -l '$(S)'
 	hg tag -l '$(S)'
-	make commit
+	make commit S='$(S)'
 	make push

VERSION

@@ -1 +1 @@
-Version 2.0.2 (2012-08-29 22:00:56) stable
+Version 2.0.3 (2012-08-31 14:27:45) stable

applications/admin/controllers/default.py

@@ -140,8 +140,8 @@ def check_version():
         return SPAN('You should upgrade to version %s' % version_number)
     else:
         return sp_button(URL('upgrade_web2py'), T('upgrade now')) \
-          + XML(' <strong class="upgrade_version">%s</strong>' % version_number)
-
+            + XML(' <strong class="upgrade_version">%s.%s.%s</strong>' \
+                      % version_number[:3])
 
 def logout():
     """ Logout handler """

applications/admin/languages/default.py

@@ -33,6 +33,7 @@
 'created by': 'created by',
 'crontab': 'crontab',
 'currently running': 'currently running',
+'currently saved or': 'currently saved or',
 'database administration': 'database administration',
 'Debug': 'Debug',
 'defines tables': 'defines tables',
@@ -43,16 +44,22 @@
 'Detailed traceback description': 'Detailed traceback description',
 'direction: ltr': 'direction: ltr',
 'Disable': 'Disable',
+'docs': 'docs',
 'download layouts': 'download layouts',
 'download plugins': 'download plugins',
 'Edit': 'Edit',
 'Edit application': 'Edit application',
+'edit views:': 'edit views:',
+'Editing file "%s"': 'Editing file "%s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Errors',
 'Exception instance attributes': 'Exception instance attributes',
 'exposes': 'exposes',
+'exposes:': 'exposes:',
 'extends': 'extends',
+'file does not exist': 'file does not exist',
+'file saved on %s': 'file saved on %s',
 'filter': 'filter',
 'Frames': 'Frames',
 'Get from URL:': 'Get from URL:',
@@ -63,8 +70,10 @@
 'inspect attributes': 'inspect attributes',
 'Install': 'Install',
 'Installed applications': 'Installed applications',
+'Key bindings': 'Key bindings',
 'languages': 'languages',
 'Languages': 'Languages',
+'Last saved on:': 'Last saved on:',
 'loading...': 'loading...',
 'locals': 'locals',
 'Login': 'Login',
@@ -72,8 +81,8 @@
 'Logout': 'Logout',
 'Models': 'Models',
 'models': 'models',
-'modules': 'modules',
 'Modules': 'Modules',
+'modules': 'modules',
 'New application wizard': 'New application wizard',
 'New simple application': 'New simple application',
 'Overwrite installed app': 'Overwrite installed app',
@@ -88,10 +97,15 @@
 'Reload routes': 'Reload routes',
 'request': 'request',
 'response': 'response',
+'restore': 'restore',
+'revert': 'revert',
 'rules are not defined': 'rules are not defined',
 'rules:': 'rules:',
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
+'Save': 'Save',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Saved file hash:',
 'session': 'session',
 'shell': 'shell',
 'Site': 'Site',
@@ -109,7 +123,9 @@
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'Ticket ID': 'Ticket ID',
 'Ticket Missing': 'Ticket Missing',
+'to  previous version.': 'to  previous version.',
 'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'toggle breakpoint': 'toggle breakpoint',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Translation strings for the application',
 'Uninstall': 'Uninstall',

applications/admin/views/default/design.html

@@ -223,16 +223,12 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
             {{=editpluralsfile('languages',pfile,dict(nplurals=p[0]))}}
           </span>
           <span class="file">
-            {{=peekfile('languages',pfile,dict(id=id))}},
+            {{=peekfile('languages',pfile,dict(id=id))}}
           </span>
         {{else:}}
-          <b>{{=T("are not used yet")}}</b>,
+          <b>{{=T("are not used yet")}}</b>
         {{pass}}
       {{pass}}
-      {{=T("rules:")}}
-        <span class="file{{=' error' if p[3]!='ok' else ''}}">
-          {{=peekfile('gluon/contrib/rules', p[2], dict(app=app, id=id), p[3] if p[3]!='ok' else None)}}
-        </span>
     {{pass}}
     )
     </td>

applications/welcome/languages/default.py

@@ -4,13 +4,119 @@
 '!langname!': 'English (US)',
 '%s %%(shop)': '%s %%(shop)',
 '%s %%(shop[0])': '%s %%(shop[0])',
+'%s %%{quark[0]}': '%s %%{quark[0]}',
 '%s %%{shop[0]}': '%s %%{shop[0]}',
 '%s %%{shop}': '%s %%{shop}',
+'%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '@markmin\x01**Hello World**': '**Hello World**',
+'About': 'About',
+'Access Control': 'Access Control',
+'Administrative Interface': 'Administrative Interface',
+'Ajax Recipes': 'Ajax Recipes',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Buy this book': 'Buy this book',
+'Cannot be empty': 'Cannot be empty',
+'Check to delete': 'Check to delete',
+'Client IP': 'Client IP',
+'Community': 'Community',
+'Components and Plugins': 'Components and Plugins',
+'Controller': 'Controller',
+'Copyright': 'Copyright',
+'Created By': 'Created By',
+'Created On': 'Created On',
+'customize me!': 'customize me!',
+'Database': 'Database',
+'DB Model': 'DB Model',
+'Demo': 'Demo',
+'Deployment Recipes': 'Deployment Recipes',
+'Description': 'Description',
+'Documentation': 'Documentation',
+"Don't know what to do?": "Don't know what to do?",
+'Download': 'Download',
+'E-mail': 'E-mail',
+'Email and SMS': 'Email and SMS',
 'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
 'enter date and time as %(format)s': 'enter date and time as %(format)s',
+'Errors': 'Errors',
+'FAQ': 'FAQ',
+'First name': 'First name',
+'Forms and Validators': 'Forms and Validators',
+'Free Applications': 'Free Applications',
+'Group %(group_id)s created': 'Group %(group_id)s created',
+'Group ID': 'Group ID',
+'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
+'Groups': 'Groups',
 'Hello World': 'Hello World',
 'Hello World  ## comment': 'Hello World  ',
 'Hello World## comment': 'Hello World',
+'Home': 'Home',
+'How did you get here?': 'How did you get here?',
+'Introduction': 'Introduction',
+'Invalid email': 'Invalid email',
+'Is Active': 'Is Active',
+'Last name': 'Last name',
+'Layout': 'Layout',
+'Layout Plugins': 'Layout Plugins',
+'Layouts': 'Layouts',
+'Live Chat': 'Live Chat',
+'Logged in': 'Logged in',
+'Logged out': 'Logged out',
+'Login': 'Login',
+'Logout': 'Logout',
+'Lost Password': 'Lost Password',
+'Lost password?': 'Lost password?',
+'Menu Model': 'Menu Model',
+'Modified By': 'Modified By',
+'Modified On': 'Modified On',
+'My Sites': 'My Sites',
+'Name': 'Name',
+'Object or table name': 'Object or table name',
+'Online examples': 'Online examples',
+'Origin': 'Origin',
+'Other Plugins': 'Other Plugins',
+'Other Recipes': 'Other Recipes',
+'Overview': 'Overview',
+'Password': 'Password',
+"Password fields don't match": "Password fields don't match",
+'please input your password again': 'please input your password again',
+'Plugins': 'Plugins',
+'Powered by': 'Powered by',
+'Preface': 'Preface',
+'Profile': 'Profile',
+'Python': 'Python',
+'Quick Examples': 'Quick Examples',
+'Recipes': 'Recipes',
+'Record ID': 'Record ID',
+'Register': 'Register',
+'Registration identifier': 'Registration identifier',
+'Registration key': 'Registration key',
+'Registration successful': 'Registration successful',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
+'Reset Password key': 'Reset Password key',
+'Role': 'Role',
+'Semantic': 'Semantic',
+'Services': 'Services',
+'Stylesheet': 'Stylesheet',
+'Support': 'Support',
+'The Core': 'The Core',
+'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
+'The Views': 'The Views',
+'This App': 'This App',
+'Timestamp': 'Timestamp',
+'Twitter': 'Twitter',
+'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': 'User ID',
+'value already in database or empty': 'value already in database or empty',
+'Verify Password': 'Verify Password',
+'Videos': 'Videos',
+'View': 'View',
+'Welcome': 'Welcome',
+'Welcome to web2py!': 'Welcome to web2py!',
+'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
+'You are successfully running web2py': 'You are successfully running web2py',
+'You can modify this application and adapt it to your needs': 'You can modify this application and adapt it to your needs',
+'You visited the url %s': 'You visited the url %s',
 }

applications/welcome/languages/plural-en.py

@@ -6,6 +6,7 @@
 'is': ['are'],
 'man': ['men'],
 'person': ['people'],
+'quark': ['quarks'],
 'shop': ['shops'],
 'this': ['these'],
 'was': ['were'],

gluon/contrib/markmin/markmin2html.py

@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # created by Massimo Di Pierro
 # recreated by Vladyslav Kozlovskyy
@@ -44,8 +44,8 @@ from markmin2pdf import markmin2pdf # requires pdflatex
 print markmin2pdf(m)
 ``
 ====================
-# This is a test block with new features:
-
+# This is a test block
+  with new features:
 This is a blockquote with
 a list with tables in it:
 -----------
@@ -71,7 +71,9 @@ a list with tables in it:
 -----------:blockquoteclass[blockquoteid]
 
 This this a new paragraph
-with a table. Table has header, footer, sections, odd and even rows:
+with a followed table.
+Table has header, footer, sections,
+odd and even rows:
 -------------------------------
 **Title 1**|**Title 2**|**Title 3**
 ==============================
@@ -98,6 +100,8 @@ Now lists can be multilevel:
   You can continue item text on
   next strings
 
+. paragraph in an item
+
 ++. Ordered item 1 of sublevel 2 with
     a paragraph (paragraph can start
     with point after plus or minus
@@ -143,13 +147,13 @@ line 1
   line 2
      line 3
 ``
-++++. Yet another item with code block:
-``
+++++. Yet another item with code block (we need to indent \`\` to add code block as part of item):
+ ``
   line 1
 line 2
   line 3
 ``
-This item finishes with this paragraph.
+ This item finishes with this paragraph.
 
 ... Item in sublevel 3 can be continued with paragraphs.
 
@@ -201,7 +205,7 @@ We wanted a markup language with the following requirements:
 - support table, ul, ol, code
 - support html5 video and audio elements (html serialization only)
 - can align images and resize them
-- can specify class for tables and code elements
+- can specify class for tables, blockquotes and code elements
 - can add anchors
 - does not use _ for markup (since it creates odd behavior)
 - automatically links urls
@@ -420,6 +424,23 @@ generates
 
 (the ``!`!`...`!`!:custom`` block is rendered by the ``custom=lambda`` function passed to ``render``).
 
+### Line breaks
+
+``[[NEWLINE]]`` tag is used to break lines:
+``
+#### Multiline [[NEWLINE]]
+   title
+paragraph [[NEWLINE]]
+with breaks[[NEWLINE]]in it
+``
+generates:
+
+#### Multiline [[NEWLINE]]
+   title
+paragraph [[NEWLINE]]
+with breaks[[NEWLINE]]in it
+
+
 ### Html5 support
 
 Markmin also supports the <video> and <audio> html5 tags using the notation:
@@ -430,7 +451,7 @@ Markmin also supports the <video> and <audio> html5 tags using the notation:
 [[message [title] link video]]
 [[message [title] link audio]]
 ``
-where ``message`` will be shown in brousers without HTML5 video/audio tags support.
+where ``message`` will be shown in browsers without HTML5 video/audio tags support.
 
 ### Latex and other extensions
 
@@ -512,18 +533,18 @@ DISABLED_META = '\x08'
 LATEX = '<img src="http://chart.apis.google.com/chart?cht=tx&chl=%s" />'
 regex_URL=re.compile(r'@/(?P<a>\w*)/(?P<c>\w*)/(?P<f>\w*(\.\w+)?)(/(?P<args>[\w\.\-/]+))?')
 regex_env=re.compile(r'@\{(?P<a>[\w\-\.]+?)(\:(?P<b>.*?))?\}')
-regex_expand_meta = re.compile('('+META+'|'+DISABLED_META+')')
+regex_expand_meta = re.compile('('+META+'|'+DISABLED_META+'|````)')
 regex_dd=re.compile(r'\$\$(?P<latex>.*?)\$\$')
-regex_code = re.compile('('+META+'|'+DISABLED_META+r')|(``(?P<t>.+?)``(?::(?P<c>[a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P<p>[^\]]*)\])?)?)',re.S)
+regex_code = re.compile('('+META+'|'+DISABLED_META+r'|````)|(``(?P<t>.+?)``(?::(?P<c>[a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P<p>[^\]]*)\])?)?)',re.S)
 regex_strong=re.compile(r'\*\*(?P<t>[^\s*]+( +[^\s*]+)*)\*\*')
 regex_del=re.compile(r'~~(?P<t>[^\s*]+( +[^\s*]+)*)~~')
 regex_em=re.compile(r"''(?P<t>[^\s']+(?: +[^\s']+)*)''")
 regex_num=re.compile(r"^\s*[+-]?((\d+(\.\d*)?)|\.\d+)([eE][+-]?[0-9]+)?\s*$")
-regex_list=re.compile('^(?:(#{1,6}|\.+ |\++ |\++\. |\-+ |\-+\. )\s*)?(.*)$')
+regex_list=re.compile('^(?:(?:(#{1,6})|(?:(\.+|\++|\-+)(\.)?))\s+)?(.*)$')
 regex_bq_headline=re.compile('^(?:(\.+|\++|\-+)(\.)?\s+)?(-{3}-*)$')
 regex_tq=re.compile('^(-{3}-*)(?::(?P<c>[a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P<p>[a-zA-Z][_a-zA-Z\-\d]*)\])?)?$')
 regex_proto = re.compile(r'(?<!["\w>/=])(?P<p>\w+):(?P<k>\w+://[\w\d\-+=?%&/:.]+)', re.M)
-regex_auto = re.compile(r'(?<!["\w>/=])(?P<k>\w+://[^\s\'\"\]\}\)]+)',re.M)
+regex_auto = re.compile(r'(?<!["\w>/=])(?P<k>\w+://[\w\d\-+_=?%&/:.]+)',re.M)
 regex_link=re.compile(r'('+LINK+r')|\[\[(?P<s>.+?)\]\]')
 regex_link_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?(?:\s+(?P<p>popup))?\s*$')
 regex_media_level2=re.compile(r'^(?P<t>\S.*?)?(?:\s+\[(?P<a>.+?)\])?(?:\s+(?P<k>\S+))?\s+(?P<p>img|IMG|left|right|center|video|audio)(?:\s+(?P<w>\d+px))?\s*$')
@@ -579,7 +600,8 @@ def render(text,
            autolinks='default',
            protolinks='default',
            class_prefix='',
-           id_prefix='markmin_'):
+           id_prefix='markmin_',
+           pretty_print=False):
     """
     Arguments:
     - text is the text to be processed
@@ -598,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 <div class="anchor" id="markmin_id"></div>
+        -- [[id]] will be converted to <a name="markmin_id"></a>
         -- [[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>
 
@@ -791,9 +813,18 @@ def render(text,
     >>> render('[[id1 [span **messag** in ''markmin''] ]] ... [[**link** to id [link\\\'s title] #mark1]]')
     '<p><div class="anchor" id="markmin_id1">span <strong>messag</strong> in markmin</div> ... <a href="#markmin_mark1" title="link\\\'s title"><strong>link</strong> to id</a></p>'
 
+    >>> render('# Multiline[[NEWLINE]]\\n title\\nParagraph[[NEWLINE]]\\nwith breaks[[NEWLINE]]\\nin it')
+    '<h1>Multiline<br /> title</h1><p>Paragraph<br /> with breaks<br /> in it</p>'
+
+    >>> render("anchor with name 'NEWLINE': [[NEWLINE [ ] ]]")
+    '<p>anchor with name \\'NEWLINE\\': <div class="anchor" id="markmin_NEWLINE"></div></p>'
+
+    >>> render("anchor with name 'NEWLINE': [[NEWLINE [newline] ]]")
+    '<p>anchor with name \\'NEWLINE\\': <div class="anchor" id="markmin_NEWLINE">newline</div></p>'
     """
     if autolinks=="default": autolinks = autolinks_simple
     if protolinks=="default": protolinks = protolinks_simple
+    pp='\n' if pretty_print else ''
     text = str(text or '')
     text = regex_backslash.sub(lambda m: m.group(1).translate(ttab_in), text)
 
@@ -801,11 +832,22 @@ def render(text,
         # this is experimental @{function/args}
         # turns into a digitally signed URL
         def u1(match,URL=URL):
-            a,c,f,args = match.group('a','c','f','args')
+            a,c,f,args = match.group('a','c','f','args')                        
             return URL(a=a or None,c=c or None,f = f or None,
                        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)
 
@@ -816,9 +858,12 @@ def render(text,
     segments = []
     def mark_code(m):
         g = m.group(0)
-        if m.group() in ( META, DISABLED_META ):
+        if g in (META, DISABLED_META ):
             segments.append((None, None, None, g))
             return m.group()
+        elif g == '````':
+            segments.append((None, None, None, ''))
+            return m.group()
         else:
             c = m.group('c') or ''
             p = m.group('p') or ''
@@ -849,13 +894,13 @@ def render(text,
     #############################################################
     # normalize spaces
     #############################################################
-    strings=[t.strip() for t in text.split('\n')]
+    strings=text.split('\n')
 
     def parse_title(t, s): #out, lev, etags, tag, s):
         hlevel=str(len(t))
         out.extend(etags[::-1])
         out.append("<h%s>%s"%(hlevel,s))
-        etags[:]=["</h%s>"%hlevel]
+        etags[:]=["</h%s>%s"%(hlevel,pp)]
         lev=0
         ltags[:]=[]
         tlev[:]=[]
@@ -880,8 +925,8 @@ def render(text,
                 out.append(etags.pop())
                 ltags.pop()
             for i in xrange(lent-lev):
-                out.append('<'+tag+'>')
-                etags.append('</'+tag+'>')
+                out.append('<'+tag+'>'+pp)
+                etags.append('</'+tag+'>'+pp)
                 lev+=1
                 ltags.append(lev)
                 tlev.append(tag)
@@ -892,8 +937,8 @@ def render(text,
                     ltags.pop()
                     out.append(etags.pop())
                 tlev[-1]=tag
-                out.append('<'+tag+'>')
-                etags.append('</'+tag+'>')
+                out.append('<'+tag+'>'+pp)
+                etags.append('</'+tag+'>'+pp)
                 ltags.append(lev)
             else:
                 if ltags.count(lev)>1:
@@ -901,7 +946,7 @@ def render(text,
                     ltags.pop()
         mtag='l'
         out.append('<li>')
-        etags.append('</li>')
+        etags.append('</li>'+pp)
         ltags.append(lev)
         if s[:1] == '-':
             (s, mtag, lineno) = parse_table_or_blockquote(s, mtag, lineno)
@@ -954,7 +999,7 @@ def render(text,
            return (s, mtag, lineno)
 
         lineno+=1
-        s = strings[lineno]
+        s = strings[lineno].strip()
         if s:
             if '|' in s:
                 # table
@@ -967,7 +1012,7 @@ def render(text,
 
                 # parse table:
                 while lineno < strings_len:
-                    s = strings[lineno]
+                    s = strings[lineno].strip()
                     if s[:1] == '=':
                         if s.count('=')==len(s) and len(s)>3:  # header or footer
                             if not thead: # if thead list is empty:
@@ -994,7 +1039,7 @@ def render(text,
                                                   if regex_num.match(f)
                                                   else '',
                                                f.strip()
-                                              ) for f in s.split('|')])+'</tr>')
+                                              ) for f in s.split('|')])+'</tr>'+pp)
                     rownum+=1
                     lineno+=1
 
@@ -1002,15 +1047,15 @@ def render(text,
                 t_id  = ' id="%s%s"'%(id_prefix, t_id) if t_id else ''
                 s = ''
                 if thead:
-                    s += '<thead>'+''.join([l for l in thead])+'</thead>'
+                    s += '<thead>'+pp+''.join([l for l in thead])+'</thead>'+pp
                 if not tbody: # tbody strings are in tout list
                     tbody = tout
                     tout = []
                 if tbody: # if tbody list is not empty:
-                    s += '<tbody>'+''.join([l for l in tbody])+'</tbody>'
+                    s += '<tbody>'+pp+''.join([l for l in tbody])+'</tbody>'+pp
                 if tout: # tfoot is not empty:
-                    s += '<tfoot>'+''.join([l for l in tout])+'</tfoot>'
-                s = '<table%s%s>%s</table>' % (t_cls, t_id, s)
+                    s += '<tfoot>'+pp+''.join([l for l in tout])+'</tfoot>'+pp
+                s = '<table%s%s>%s%s</table>%s' % (t_cls, t_id, pp, s, pp)
                 mtag='t'
             else:
                 # parse blockquote:
@@ -1021,7 +1066,7 @@ def render(text,
 
                 # search blockquote closing line:
                 while lineno < strings_len:
-                    s = strings[lineno]
+                    s = strings[lineno].strip()
                     if not t_mode:
                         m = regex_tq.match(s)
                         if m:
@@ -1031,7 +1076,7 @@ def render(text,
                                break
 
                         if regex_bq_headline.match(s):
-                            if lineno+1 < strings_len and strings[lineno+1]:
+                            if lineno+1 < strings_len and strings[lineno+1].strip():
                                     t_mode = True
                             lineno+=1
                             continue
@@ -1044,7 +1089,7 @@ def render(text,
 
                 t_cls = ' class="%s%s"'%(class_prefix,t_cls) if t_cls and t_cls != 'id' else ''
                 t_id  = ' id="%s%s"'%(id_prefix,t_id) if t_id else ''
-                s = '<blockquote%s%s>%s</blockquote>' \
+                s = '<blockquote%s%s>%s</blockquote>%s' \
                          % (t_cls,
                             t_id,
                             render('\n'.join(strings[bq_begin:lineno]),
@@ -1057,7 +1102,9 @@ def render(text,
                                    autolinks,
                                    protolinks,
                                    class_prefix,
-                                   id_prefix)
+                                   id_prefix,
+                                   pretty_print),
+                            pp
                            )
                 mtag='q'
         else:
@@ -1068,53 +1115,58 @@ def render(text,
 
     if sep == 'p':
       pbeg = "<p>"
-      pend = "</p>"
+      pend = "</p>"+pp
       br = ''
     else:
       pbeg = pend = ''
-      br = "<br />" if sep=='br' else ''
+      br = "<br />"+pp if sep=='br' else ''
 
-    lev = 0 # рівень вкладеності списків
-    c0 = '' # перший символ поточного рядка
-    out = [] # результуючий список рядків
-    etags = [] # завершуючі таги
-    ltags = [] # номер рівня відповідний завершуючому тагу
-    tlev = [] # таг рівня ('ul' або 'ol')
-    mtag = '' # marked tag (~last tag) ('l','.','h','p','t'). Used for set <br/>
-              # and for avoid <p></p> around tables and blockquotes
+    lev = 0    # nesting level of lists
+    c0 = ''    # first character of current line
+    out = []   # list of processed lines
+    etags = [] # trailing tags
+    ltags = [] # level# correspondent to trailing tag
+    tlev = []  # list of tags for each level ('ul' or 'ol')
+    mtag = ''  # marked tag (~last tag) ('l','.','h','p','t'). Used to set <br/>
+               # and to avoid <p></p> around tables and blockquotes
     lineno = 0
     strings_len = len(strings)
     while lineno < strings_len:
-        s = strings[lineno]
+        s0 = strings[lineno][:1]
+        s = strings[lineno].strip()
         """ #     +     -     .             ---------------------
             ##    ++    --    ..   -------  field | field | field  <-title
             ###   +++   ---   ...  quote    =====================
             ####  ++++  ----  .... -------  field | field | field  <-body
             ##### +++++ ----- .....         ---------------------:class[id]
         """
-        pc0=c0 # перший символ попереднього рядка
+        pc0=c0 # first character of previous line
         c0=s[:1]
         if c0: # for non empty strings
             if c0 in "#+-.": # first character is one of: # + - .
-                match = regex_list.search(s)
-                (t,p,s) = match.group(1), None, match.group(2)
-                t = (t or '').strip()
-                if t.endswith('.'): t, p = t[:-1], '.'
-                # t - tag ("###", "+++", "---", "...")
+                (t1,t2,p,ss) = regex_list.findall(s)[0]
+                # t1 - tag ("###")
+                # t2 - tag ("+++", "---", "...")
                 # p - paragraph point ('.')->for "++." or "--."
-                # s - other part of string
-                if t:
+                # ss - other part of string
+                if t1 or t2:
                     # headers and lists:
                     if c0 == '#': # headers
-                        (lev, mtag) = parse_title(t, s)
+                        (lev, mtag) = parse_title(t1, ss)
+                        lineno+=1
+                        continue
                     elif c0 == '+': # ordered list
-                        (lev, mtag, lineno)= parse_list(t, p, s, 'ol', lev, mtag, lineno)
+                        (lev, mtag, lineno)= parse_list(t2, p, ss, 'ol', lev, mtag, lineno)
+                        lineno+=1
+                        continue
                     elif c0 == '-': # unordered list
-                        (lev, mtag, lineno) = parse_list(t, p, s, 'ul', lev, mtag, lineno)
-                    else: # c0 == '.' # paragraph in lists
-                        (lev, mtag, lineno) = parse_point(t, s, lev, mtag, lineno)
-                    lineno+=1
-                    continue
+                        (lev, mtag, lineno) = parse_list(t2, p, ss, 'ul', lev, mtag, lineno)
+                        lineno+=1
+                        continue
+                    elif lev>0: # and c0 == '.' # paragraph in lists
+                        (lev, mtag, lineno) = parse_point(t2, ss, lev, mtag, lineno)
+                        lineno+=1
+                        continue
                 else:
                     if c0 == '-': # table or blockquote?
                         (s, mtag, lineno) = parse_table_or_blockquote(s, mtag, lineno)
@@ -1123,7 +1175,7 @@ def render(text,
                 # new paragraph
                 pc0=''
 
-            if pc0 == '':
+            if pc0 == '' or (mtag != 'p' and s0 not in (' ','\t')):
                 # paragraph
                 out.extend(etags[::-1])
                 etags=[]
@@ -1171,12 +1223,12 @@ def render(text,
         style = p_begin = p_end = ''
         if p == 'center':
             p_begin = '<p style="text-align:center">'
-            p_end = '</p>'
+            p_end = '</p>'+pp
         elif p in ('left','right'):
             style = ' style="float:%s"' % p
         if p in ('video','audio'):
             t = render(t, {}, {}, 'br', URL, environment, latex,
-                       autolinks, protolinks, class_prefix, id_prefix)
+                       autolinks, protolinks, class_prefix, id_prefix, pretty_print)
             return '<%(p)s controls="controls"%(title)s%(width)s><source src="%(k)s" />%(t)s</%(p)s>' \
                     % dict(p=p, title=title, width=width, k=k, t=t)
         alt = ' alt="%s"'%escape(t).replace(META, DISABLED_META) if t else ''
@@ -1197,13 +1249,16 @@ def render(text,
             title = ' title="%s"' % a.replace(META, DISABLED_META) if a else ''
             target = ' target="_blank"' if p == 'popup' else ''
             t = render(t, {}, {}, 'br', URL, environment, latex, autolinks,
-                       protolinks, class_prefix, id_prefix) if t else k
+                       protolinks, class_prefix, id_prefix, pretty_print) if t else k
             return '<a href="%(k)s"%(title)s%(target)s>%(t)s</a>' \
                    % dict(k=k, title=title, target=target, t=t)
+        if t == 'NEWLINE' and not a:
+            return '<br />'+pp
         return '<div class="anchor" id="%s">%s</div>' % (escape(id_prefix+t),
-                                        render(a, {},{},'br', URL,
-                                               environment, latex, autolinks,
-                                               protolinks, class_prefix, id_prefix))
+                                                         render(a, {},{},'br', URL,
+                                                                environment, latex, autolinks,
+                                                                protolinks, class_prefix,
+                                                                id_prefix, pretty_print))
 
     parts = text.split(LINK)
     text = parts[0]
@@ -1230,9 +1285,9 @@ def render(text,
             if code[:1]=='\n': code=code[1:]
             if code[-1:]=='\n': code=code[:-1]
             if p:
-                return extra[b](code,p)
+                return str(extra[b](code,p))
             else:
-                return extra[b](code)
+                return str(extra[b](code))
         elif b=='cite':
             return '['+','.join('<a href="#%s" class="%s">%s</a>' \
                   % (d,b,d) \
@@ -1241,41 +1296,37 @@ def render(text,
             return LATEX % code.replace('"','\"').replace('\n',' ')
         elif b in html_colors:
             return '<span style="color: %s">%s</span>' \
-                  % (b, render(code,{},{},'br',URL,environment,latex,autolinks, protolinks))
+                  % (b, render(code, {}, {}, 'br', URL, environment, latex,
+                      autolinks, protolinks, class_prefix, id_prefix, pretty_print))
         elif b in ('c', 'color') and p:
              c=p.split(':')
              fg='color: %s;' % c[0] if c[0] else ''
              bg='background-color: %s;' % c[1] if len(c)>1 and c[1] else ''
              return '<span style="%s%s">%s</span>' \
-                 % (fg, bg, render(code,{},{},'br', URL, environment, latex, autolinks, protolinks))
+                 % (fg, bg, render(code, {}, {}, 'br', URL, environment, latex,
+                    autolinks, protolinks, class_prefix, id_prefix, pretty_print))
         cls = ' class="%s%s"'%(class_prefix,b) if b and b != 'id' else ''
         id  = ' id="%s%s"'%(id_prefix,escape(p)) if p else ''
         beg=(code[:1]=='\n')
         end=[None,-1][code[-1:]=='\n']
         if beg and end:
-            return '<pre><code%s%s>%s</code></pre>' % (cls, id, escape(code[1:-1]))
+            return '<pre><code%s%s>%s</code></pre>%s' % (cls, id, escape(code[1:-1]), pp)
         return '<code%s%s>%s</code>' % (cls, id, escape(code[beg:end]))
-
     text = regex_expand_meta.sub(expand_meta, text)
     text = text.translate(ttab_out)
-
-    if environment:
-        def u2(match, environment=environment):
-            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
 
 def markmin2html(text, extra={}, allowed={}, sep='p', 
-                 autolinks='default',protolinks='default'):                 
+                 autolinks='default', protolinks='default',
+                 class_prefix='', id_prefix='markmin_', pretty_print=False):                 
     return render(text, extra, allowed, sep, 
-                  autolinks=autolinks, protolinks=protolinks)
+                  autolinks=autolinks, protolinks=protolinks,
+                  class_prefix=class_prefix, id_prefix=id_prefix,
+                  pretty_print=pretty_print)
+
+def run_doctests():
+    import doctest
+    doctest.testmod()
 
 if __name__ == '__main__':
     import sys
@@ -1312,7 +1363,9 @@ if __name__ == '__main__':
                 pre { background-color: #E0E0E0; padding: 5px; }
               </style>""")[1:]
 
-        print html % dict(title="Markmin markup language", style=style, body=markmin2html(__doc__))
+        print html % dict(title="Markmin markup language",
+                          style=style,
+                          body=markmin2html(__doc__, pretty_print=True))
     elif sys.argv[1:2] == ['-t']:
         from timeit import Timer
         loops=1000
@@ -1338,7 +1391,8 @@ if __name__ == '__main__':
             else:
                 markmin_style = ""
 
-            print html % dict(title=sys.argv[1], style=markmin_style, body=markmin2html(markmin_text))
+            print html % dict(title=sys.argv[1], style=markmin_style,
+                              body=markmin2html(markmin_text, pretty_print=True))
         finally:
             fargv.close()
 
@@ -1348,4 +1402,4 @@ if __name__ == '__main__':
         print "       -t  - timeit __doc__ (for testing purpuse only)"
         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)"
-        doctest.testmod()
+        run_doctests()

gluon/contrib/plural_rules/__init__.py

@@ -0,0 +1 @@
+

gluon/contrib/webclient.py

@@ -39,6 +39,7 @@ class WebClient(object):
                  session_regex = SESSION_REGEX):
         self.app = app
         self.postbacks = postbacks
+        self.forms = {}
         self.history = []
         self.cookies = {}
         self.default_headers = default_headers

gluon/languages.py

@@ -12,13 +12,14 @@ Plural subsystem is created by Vladyslav Kozlovskyy (Ukraine)
 
 import os
 import re
+import pkgutil
 from utf8 import Utf8
 from cgi import escape
 import portalocker
 import logging
 import marshal
 import copy_reg
-from fileutils import abspath, listdir
+from fileutils import listdir
 import settings
 from cfs import getcfs
 from thread import allocate_lock
@@ -31,6 +32,8 @@ __all__ = ['translator', 'findT', 'update_all_languages']
 ospath = os.path
 ostat = os.stat
 osep = os.sep
+pjoin = os.path.join
+pdirname = os.path.dirname
 isdir = os.path.isdir
 is_gae = settings.global_settings.web2py_runtime_gae
 
@@ -80,7 +83,6 @@ regex_backslash = re.compile(r"\\([\\{}%])")
 regex_plural = re.compile('%({.+?})')
 regex_plural_dict = re.compile('^{(?P<w>[^()[\]][^()[\]]*?)\((?P<n>[^()\[\]]+)\)}$')  # %%{word(varname or number)}
 regex_plural_tuple = re.compile('^{(?P<w>[^[\]()]+)(?:\[(?P<i>\d+)\])?}$') # %%{word[index]} or %%{word}
-regex_plural_rules = re.compile('^plural_rules-[a-zA-Z]{2}(-[a-zA-Z]{2})?\.py$')
 
 # UTF8 helper functions
 def upper_fun(s):
@@ -213,47 +215,30 @@ def read_possible_languages(appdir):
         langs['en'] = ('en', 'English', 0)
     return langs
 
-def read_global_plural_rules(filename):
-    """
-    retrieve plural rules from rules/*plural_rules-lang*.py file.
-
-    args:
-        filename (str): plural_rules filename
-
-    returns:
-        (nplurals, get_plural_id, construct_plural_form, status)
-        e.g.: (3, <function>, <function>, ok)
-    """
-    env = {}
-    data = portalocker.read_locked(filename)
-    try:
-        exec(data) in env
-        status='ok'
-    except Exception, e:
-        status='Syntax error in %s (%s)' % (filename, e)
-        logging.error(status)
-    nplurals = env.get('nplurals', DEFAULT_NPLURALS)
-    get_plural_id = env.get('get_plural_id', DEFAULT_GET_PLURAL_ID)
-    construct_plural_form = env.get('construct_plural_form',
-                                    DEFAULT_CONSTRUCTOR_PLURAL_FORM)
-    return (nplurals, get_plural_id, construct_plural_form, status)
-
-
 def read_possible_plurals():
     """
     create list of all possible plural rules files
     result is cached to increase speed
     """
-    pdir = abspath('gluon','contrib','rules')
-    plurals = {}
-    # scan rules directory for plural_rules-*.py files:
-    for pname in os.listdir(pdir):
-        if not isdir(pname) and regex_plural_rules.match(pname):
-            lang = pname[13:-3]
-            fname = ospath.join(pdir, pname)
-            n, f1, f2, status = read_global_plural_rules(fname)
-            if status == 'ok':
-                plurals[lang] = (lang, n, f1, f2, pname)
+    try:
+        import gluon.contrib.plural_rules as package
+        plurals = {}
+        for importer, modname, ispkg in pkgutil.iter_modules(package.__path__):
+            if len(modname)==2:
+                module = __import__(package.__name__+'.'+modname)
+                lang = modname
+                pname = modname+'.py'
+                nplurals = getattr(module,'nplurals', DEFAULT_NPLURALS)
+                get_plural_id = getattr(
+                    module,'get_plural_id', 
+                    DEFAULT_GET_PLURAL_ID)
+                construct_plural_form = getattr(
+                    module,'construct_plural_form',
+                    DEFAULT_CONSTRUCTOR_PLURAL_FORM)
+                plurals[lang] = (lang, nplurals, get_plural_id,
+                                 construct_plural_form, pname)
+    except ImportError:
+        logging.warn('Unable to import plural rules')
     plurals['default'] = ('default',
                           DEFAULT_NPLURALS,
                           DEFAULT_GET_PLURAL_ID,
@@ -505,7 +490,7 @@ class translator(object):
         if int(n)==1:
             return word
         elif word:
-            id = min(int(n)-1,1) # self.get_plural_id(abs(int(n)))
+            id = self.get_plural_id(abs(int(n)))
             # id = 0 first plural form
             # id = 1 second plural form
             # etc.

gluon/main.py

@@ -30,7 +30,7 @@ import string
 import urllib2
 from thread import allocate_lock
 
-from fileutils import abspath, write_file, parse_version
+from fileutils import abspath, write_file, parse_version, copystream
 from settings import global_settings
 from admin import add_path_first, create_missing_folders, create_missing_app_folders
 from globals import current
@@ -84,7 +84,6 @@ from http import HTTP, redirect
 from globals import Request, Response, Session
 from compileapp import build_environment, run_models_in, \
     run_controller_in, run_view_in
-from fileutils import copystream, parse_version
 from contenttype import contenttype
 from dal import BaseAdapter
 from settings import global_settings
@@ -384,7 +383,7 @@ def wsgibase(environ, responder):
                 # ##################################################
 
                 eget = environ.get
-                if not eget('PATH_INFO',None) and eget('REQUEST_URI',None):
+                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('?')
@@ -393,9 +392,14 @@ def wsgibase(environ, responder):
                         environ['QUERY_STRING'] = items[1]
                     else:
                         environ['QUERY_STRING'] = ''
-                if not eget('HTTP_HOST',None):
+                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')
+                        eget('SERVER_NAME') + ':' + eget('SERVER_PORT')
                     
 
                 (static_file, environ) = url_in(request, environ)

gluon/rewrite.py

@@ -994,6 +994,7 @@ class MapUrlIn(object):
             static_file = pjoin(self.request.env.applications_parent,
                                 'applications', self.application,
                                 'static', file)
+        self.extension = None
         log_rewrite("route: static=%s" % static_file)
         return static_file
 
@@ -1053,7 +1054,7 @@ class MapUrlIn(object):
         if self.map_hyphen:
             uri = uri.replace('_', '-')
             app = app.replace('_', '-')
-        if self.extension != 'html':
+        if self.extension and self.extension != 'html':
             uri += '.' + self.extension
         if self.language:
             uri = '/%s%s' % (self.language, uri)
@@ -1271,19 +1272,14 @@ def map_url_in(request, env, app=False):
     # handle mapping of lang/static to static/lang in externally-rewritten URLs
     # in case we have to handle them ourselves
     if map.languages and map.map_static is False and map.arg0 == 'static' and map.args(1) in map.languages:
-        if 'es' in map.languages:
-            print 'handle static/lang %s' % map.args(1)
         map.map_controller()
         map.map_language()
     else:
-        if 'es' in map.languages:
-            print 'NO handle static/lang %s' % map.args(1)
         map.map_language()
         map.map_controller()
     static_file = map.map_static()
-    if 'es' in map.languages:
-        print 'static_file=%s' % static_file
     if static_file:
+        map.update_request()
         return (static_file, map.env)
     map.map_function()
     map.validate_args()

gluon/scheduler.py

@@ -262,7 +262,8 @@ class MetaScheduler(threading.Thread):
 
             start = time.time()
 
-            while p.is_alive() and (time.time()-start < task.timeout):
+            while p.is_alive() and (
+                not task.timeout or time.time()-start < task.timeout):
                 if tout:
                     try:
                         logging.debug(' partial output saved')

gluon/sql.py

@@ -1,8 +1,8 @@
 # this file exists for backward compatibility
 
-__all__ = ['DAL','Field','drivers']
+__all__ = ['DAL','Field','DRIVERS']
 
-from dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, drivers, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType
+from dal import DAL, Field, Table, Query, Set, Expression, Row, Rows, DRIVERS, BaseAdapter, SQLField, SQLTable, SQLXorable, SQLQuery, SQLSet, SQLRows, SQLStorage, SQLDB, GQLDB, SQLALL, SQLCustomType
 
 
 

gluon/sqlhtml.py

@@ -1656,7 +1656,7 @@ class SQLFORM(FORM):
         if user_signature:
             if (args != request.args and user_signature and \
                     not URL.verify(request,user_signature=user_signature)) or \
-                    (not session.auth.user and \
+                    (not (session.auth and session.auth.user) and \
                          ('edit' in request.args or \
                               'create' in request.args or \
                               'delete' in request.args)):
@@ -1826,14 +1826,15 @@ class SQLFORM(FORM):
                     try:
                         dbset = dbset(SQLFORM.build_query(
                                 fields,request.vars.get('keywords','')))
-                        rows = dbset.select()
+                        rows = dbset.select(cacheable=True)
                     except Exception, e:
                         response.flash = T('Internal Error')
                         rows = []
                 else:
-                    rows = dbset.select()
+                    rows = dbset.select(cacheable=True)
             else:
-                rows = dbset.select(left=left,orderby=orderby,*columns)
+                rows = dbset.select(left=left,orderby=orderby,
+                                    cacheable=True*columns)
 
             if export_type in exportManager:
                 value = exportManager[export_type]
@@ -1892,7 +1893,8 @@ class SQLFORM(FORM):
         try:
             if left or groupby:
                 c = 'count(*)'
-                nrows = dbset.select(c,left=left,groupby=groupby).first()[c]
+                nrows = dbset.select(c,left=left,cacheable=True,
+                                     groupby=groupby).first()[c]
             else:
                 nrows = dbset.count()
         except:
@@ -1976,7 +1978,9 @@ class SQLFORM(FORM):
 
         try:
             table_fields = [f for f in fields if f._tablename in tablenames]
-            rows = dbset.select(left=left,orderby=orderby,groupby=groupby,limitby=limitby,*table_fields)
+            rows = dbset.select(left=left,orderby=orderby,
+                                groupby=groupby,limitby=limitby,
+                                cacheable=True,*table_fields)
         except SyntaxError:
             rows = None
             error = T("Query Not Supported")
@@ -2186,12 +2190,14 @@ class SQLFORM(FORM):
                         LI(A(T(db[referee]._plural),
                              _class=trap_class(),
                              _href=url()),
-                           SPAN(divider,_class='divider'),_class='w2p_grid_breadcrumb_elem'))
+                           SPAN(divider,_class='divider'),
+                           _class='w2p_grid_breadcrumb_elem'))
                     if kwargs.get('details',True):
                         breadcrumbs.append(
                             LI(A(name,_class=trap_class(),
                                  _href=url(args=['view',referee,id])),
-                               SPAN(divider,_class='divider'),_class='w2p_grid_breadcrumb_elem'))
+                               SPAN(divider,_class='divider'),
+                               _class='w2p_grid_breadcrumb_elem'))
                     nargs+=2
                 else:
                     break
@@ -2217,16 +2223,18 @@ class SQLFORM(FORM):
                     del kwargs[key]
         check = {}
         id_field_name = table._id.name
-        for field in table._referenced_by:
-            if field.readable:
-                check[field.tablename] = check.get(field.tablename,[])+[field.name]
+        for rfield in table._referenced_by:
+            if rfield.readable:
+                check[rfield.tablename] = \
+                    check.get(rfield.tablename,[])+[rfield.name]
         for tablename in sorted(check):
             linked_fieldnames = check[tablename]
             tb = db[tablename]
             multiple_links = len(linked_fieldnames)>1
             for fieldname in linked_fieldnames:
                 if linked_tables is None or tablename in linked_tables:
-                    t = T(tb._plural) if not multiple_links else T(tb._plural+'('+fieldname+')')
+                    t = T(tb._plural) if not multiple_links else \
+                        T(tb._plural+'('+fieldname+')')
                     args0 = tablename+'.'+fieldname
                     links.append(
                         lambda row,t=t,nargs=nargs,args0=args0:\

gluon/tests/__init__.py

@@ -9,4 +9,5 @@ from test_storage import *
 from test_template import *
 from test_utils import *
 from test_contribs import *
+from test_markmin import *
 # from test_web import *

gluon/tests/test_dal.py

@@ -411,12 +411,14 @@ class TestMinMaxSum(unittest.TestCase):
         self.assertEqual(db.t.insert(a=3), 3)
         s = db.t.a.min()
         self.assertEqual(db(db.t.id > 0).select(s)[0]._extra[s], 1)
+        self.assertEqual(db(db.t.id > 0).select(s).first()[s], 1)
+        self.assertEqual(db().select(s).first()[s], 1)
         s = db.t.a.max()
-        self.assertEqual(db(db.t.id > 0).select(s)[0]._extra[s], 3)
+        self.assertEqual(db().select(s).first()[s], 3)
         s = db.t.a.sum()
-        self.assertEqual(db(db.t.id > 0).select(s)[0]._extra[s], 6)
+        self.assertEqual(db().select(s).first()[s], 6)
         s = db.t.a.count()
-        self.assertEqual(db(db.t.id > 0).select(s)[0]._extra[s], 3)
+        self.assertEqual(db().select(s).first()[s], 3)
         db.t.drop()
 
 

gluon/tests/test_languages.py

@@ -81,6 +81,10 @@ try:
                              '1 shop')
             self.assertEqual(str(T('%s %%{shop[0]}', 2)),
                              '2 shops')
+            self.assertEqual(str(T('%s %%{quark[0]}', 1)),
+                             '1 quark')
+            self.assertEqual(str(T('%s %%{quark[0]}', 2)),
+                             '2 quarks')
             self.assertEqual(str(T.M('**Hello World**')),
                              '<strong>Hello World</strong>')
             T.force('it')

gluon/tests/test_web.py

@@ -41,6 +41,11 @@ class TestWeb(unittest.TestCase):
         client.get('index')
         self.assertTrue('Welcome Homer' in client.text)
 
+        client = WebClient('http://127.0.0.1:8000/admin/default/')
+        client.post('index',data=dict(password='hello'))
+        client.get('site')
+        client.get('design/welcome')
+
 if __name__ == '__main__':
     unittest.main()
 

gluon/tools.py

@@ -1060,6 +1060,7 @@ 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:
@@ -1257,6 +1258,9 @@ class Auth(object):
             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:
                 bar.insert(-1, s2)
@@ -1612,12 +1616,12 @@ class Auth(object):
         checks = []
         # make a guess about who this user is
         for fieldname in ['registration_id','username','email']:
-            if fieldname in table_user.fields() and keys.get(fieldname,None):
+            if fieldname in table_user.fields() and \
+                    keys.get(fieldname,None):
                 checks.append(fieldname)
                 value = keys[fieldname]
-                user = user or table_user._db(
-                    (table_user.registration_id==value)|
-                    (table_user[fieldname]==value)).select().first()
+                user = table_user(**{fieldname:value})
+                if user: break
         if not checks:
             return None
         if not 'registration_id' in keys:

gluon/widget.py

@@ -1004,9 +1004,9 @@ def start(cron=True):
         print ProgramAuthor
         print ProgramVersion
 
-    from dal import drivers
+    from dal import DRIVERS
     if not options.nobanner:
-        print 'Database drivers available: %s' % ', '.join(drivers)
+        print 'Database drivers available: %s' % ', '.join(DRIVERS)
 
 
     # ## if -L load options from options.config file

logging.example.conf

@@ -27,12 +27,14 @@
 #  set by the setLevel call, the [logger_myapp] section, and the [handler_...]
 #  section. For example, you will not see DEBUG messages unless all three are
 #  set to DEBUG.
+#
+#  Available levels: DEBUG INFO WARNING ERROR CRITICAL
 
 [loggers]
 keys=root,rocket,markdown,web2py,rewrite,cron,app,welcome
 
 [handlers]
-keys=consoleHandler,messageBoxHandler
+keys=consoleHandler,messageBoxHandler,rotatingFileHandler
 #keys=consoleHandler,rotatingFileHandler
 #keys=osxSysLogHandler
 
@@ -41,50 +43,53 @@ keys=simpleFormatter
 
 [logger_root]
 level=WARNING
-handlers=consoleHandler
+handlers=consoleHandler,rotatingFileHandler
 
 [logger_web2py]
 level=WARNING
-handlers=consoleHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=web2py
 propagate=0
 
+#  URL rewrite logging (routes.py)
+#  See also the logging parameter in routes.py
+#
 [logger_rewrite]
 level=WARNING
 qualname=web2py.rewrite
-handlers=consoleHandler
+handlers=consoleHandler,rotatingFileHandler
 propagate=0
 
 [logger_cron]
 level=WARNING
 qualname=web2py.cron
-handlers=consoleHandler
+handlers=consoleHandler,rotatingFileHandler
 propagate=0
 
 # generic app handler
 [logger_app]
 level=WARNING
 qualname=web2py.app
-handlers=consoleHandler
+handlers=consoleHandler,rotatingFileHandler
 propagate=0
 
 # welcome app handler
 [logger_welcome]
 level=WARNING
-qualname=web2py.app.welcome
+qualname=web2py.app.welcome,rotatingFileHandler
 handlers=consoleHandler
 propagate=0
 
 # loggers for legacy getLogger calls: Rocket and markdown
 [logger_rocket]
 level=WARNING
-handlers=consoleHandler,messageBoxHandler
+handlers=consoleHandler,messageBoxHandler,rotatingFileHandler
 qualname=Rocket
 propagate=0
 
 [logger_markdown]
 level=WARNING
-handlers=consoleHandler
+handlers=consoleHandler,rotatingFileHandler
 qualname=markdown
 propagate=0
 
@@ -106,7 +111,7 @@ args=()
 #
 [handler_rotatingFileHandler]
 class=handlers.RotatingFileHandler
-level=INFO
+level=DEBUG
 formatter=simpleFormatter
 args=("logs/web2py.log", "a", 1000000, 5)
 

web2py.py

@@ -9,10 +9,10 @@ if '__file__' in globals():
 elif hasattr(sys, 'frozen'):
     path = os.path.dirname(os.path.abspath(sys.executable)) # for py2exe
 else: #should never happen
-     path = os.getcwd()
+    path = os.getcwd()
 os.chdir(path)
 
-sys.path = [path]+[p for p in sys.path if not p==path]
+sys.path = [path]+[p for p in sys.path if not p == path]
 
 # import gluon.import_all ##### This should be uncommented for py2exe.py
 import gluon.widget