From dbf6ce6d6c64de889470b8d101a3acffdca46480 Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Sat, 22 Sep 2012 00:06:21 +0200 Subject: [PATCH 01/78] Modified share to Buzz to Google+ --- .../welcome/static/images/google-buzz.png | Bin 1976 -> 0 bytes applications/welcome/static/images/gplus-32.png | Bin 0 -> 1513 bytes applications/welcome/static/js/share.js | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 applications/welcome/static/images/google-buzz.png create mode 100644 applications/welcome/static/images/gplus-32.png diff --git a/applications/welcome/static/images/google-buzz.png b/applications/welcome/static/images/google-buzz.png deleted file mode 100644 index 844d5412db197af8942c71747d899c08694e7c75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1976 zcmV;p2S@mcP)l+U-0@@V z+IiRRP$1CXP!~zy7Ov^J`H@U6*MI2sj}HzUc@84Gx##gsFLkut*>}%|weWk~w-O)u zl9KrE(C`75OX?mtf<4^+KOWk>Wz&WOT^;M_F$be;-ckahz|*gVlV{K4?1hVcV!-F? zZ*N%*-7pEfj9a~QgOL!hzI6?TN3Zsak#Hy>hypajz!$X`7QGgHPl?rX!kIyVZsg%km%vKmen44Xi`TYy{Oa96z#8|xD| zPek5(?Uz{76-2mu?+R|Phya0G*RjA){xXEDCy1xEHX={JZw+UVD(GN*EvrJD2^n>+ z6{8Hn(6P%njIVExgDZ|8`A$DVJ^Pj?KxagY1X#;hVE@q}jB_6BY;C|mvValNxC-hJ zU}wv;4N{<_>6lDs@U8p-^xT(6xcNbF-iKkGIfBpLeF2fJ&n$HTo#o4P`15;yU;uT$ z+lP%_3xB;djiH$$6xFb|O1q?J$QMYK`zK1Hr?4Cr&&*#j>9sv`>`gq95DsDW)@d2UI~iUqYHd)42jNw5KyU zT)vvbquR^Zw=;lnq78yC)YR+0y@{5t7Hl26h;(v4 zUcC2d1fwyEdxV z1gzQ^D17n>JRZu=*(`zq36Bd|l>hx({Ho(gNRb#ghlHVNFf%Fakl(>CzTJ%Q?W=0R zZ564smo*5I1(`CXlp2B@i=oIwaJXu_?Xw77rbZr!=?q&(30Es6{E14=zg#g8X>6Adz ziEzv9fu@vUP+?(O2-LlNbpbrp;m5OMufsbv0cma=Yh%aJyDg7EBagQmU3mAz-=WS< zz|s`bTBWX20Mrbu(iF<+5opCC48c>ysn!9@A+YezH8nw{OI0@^Srvs?pKyo#c={_* za3_!B)eQo=yA^~&WI_&b1$ex5n;XhM{)MmIdpG28grZx4rOpDS2^dpjP$*+`|7y4v zYQEs4Vbui-%&0~eHhl?2)wC^OIlHV<7R+VgZkWaWJt`tWx5F?0;d3bqe;fdqxHDW#WH|gTm?s!1Pfk|kHf)I6s3Z zj%!4yy~0QC_{;8KZz!ixfp|CGHmuf1rk?N3*52`p`ahx?|vVz{P}12 zbd!lYJSJ&_rPb_n1gKGBf)XH0v%;C!Lul&wCPIFnEpstO1rwDRSV)P*t1cA6hhyh( zdXB9w!FK z1&j@9UpPJTA^tS@8hDvUu0S&YX*OT9AQ=*x0&$GzCQ&LYHW`m7qsbq~x=16sR&}B& z6t`vgXvD7zhnC2$gaGIC0#=PUESZX~OphWWhcTK-!Yot(?r&L-FR$)|S6cbofobjc zc_F)`>rPuXCW`@0Gn~Avjf3qSy?C(YfhE%t^PMP)Fbt#mY~daow>@qdk|fJ1v7}UA@{%TOFF#CL|JO(!B=-;|7&fnITK|6rFW5rku_(MAxoV=Dxmn^f*$jhW zF-(SS+ww>IfAdmvJl;p&h-hqxQuE<%`iDxT4O3a3p2exNgGi=Q2Y&j)@9n8N^Vt_( z+)W<}{cc%K2oy|$Al_60W$Ik)3rtbf5nb2&f4=tz2ig7q2`~T?5QoJ-f!3=40000< KMNUMnLSTZR$)e-{ diff --git a/applications/welcome/static/images/gplus-32.png b/applications/welcome/static/images/gplus-32.png new file mode 100644 index 0000000000000000000000000000000000000000..c42eab784578bf4e827722400f125760ebab527a GIT binary patch literal 1513 zcmV~mL-d9E}6-eW&UBZZ2My_Cfm%i zR~F|3K~NBsXK5*=D3)i1wty(22(yB`TUx&RokMTe)+&h3CZC-4{C@YG-#z!-d&`WO zGS-!qz^GkB4wEK=|ACn(NH+1}^K$G@-wCy z0;G7yEEQ9(4no!1aNNo}0oZK9SWg%F&gWvdMeFGE#5OSwZT4>7=WNp!v>pB&nq6C< ze0`nBxsnntCUn;FS~TQt1(Z_(Qe0=pMhw?5W1SYR?%xf?>OeHnUTCEOc*}pQcWi=X z_`V}=;&v}o8LJ(6o;0ULd0YW0-e$*UEEaIq(NVfaeqzuTI#|+7zvZ+)8V`O1DVMud zkR$d@vpugu=KqlDG`9lW;+2HW&?e$0dT)r0#3yvukQ|26SYM17+9Bmn4-cU{F$7mA z#&Z;Ilg;85BjW5K2>{ar;8Phz&JpAg9TdRG24xRXBc2dwLg0 zaS1Dt1>wf2zhE`pb1~J|3zMc6!_8Vp-#xVw@)UZ+(o)U`-%swOSe3nHmDE`jxdIB> zV8&mL!c?ckkhWg5(}Vr6-Ww1mdpc2>5`#)Qi)W$2-ZD{Hj2}v(R*6CiBUa#i#B!8n zB*97#CrMvn9_@`)v>*JQiBfyZ`0g$vrA~Mu)$eY`^uQg5v5q!eppAGbdX-D=(_$BC zKzF==qBUWdyxxWB{@V_NiVBpZ#)`Yd({XbtacU*3ByuIV3w-Irm!lwT8P0|-Ltf}o zXg>J>)AZ_fHp*|oots5&F&+1`SRoCRPm|?_EJaaLB-H!&K>O8aF#h@@ZqdJ@$?HZ~ z`fj?Iy3vKYkM|*;iY=nT7oyPKvUBw0YdmxirrK&)dV3s3ni?=DFBSNA=a{4}doS{+ zaK0LaPw2cI8*gug^kR3*sZ}FL+C1UXT$O&4E zv$9~ARC1WR90=>T`dVjeH1J4JnS9Y<8;0P&*v_?+xtd)gw|EW3ec P00000NkvXXu0mjf1Z(LN literal 0 HcmV?d00001 diff --git a/applications/welcome/static/js/share.js b/applications/welcome/static/js/share.js index ab0bcf1b..5e9d2c26 100644 --- a/applications/welcome/static/js/share.js +++ b/applications/welcome/static/js/share.js @@ -21,8 +21,8 @@ jQuery(function(){ var title = escape(jQuery('title').text()); var twit = 'http://twitter.com/home?status='+title+'%20'+url; var facebook = 'http://www.facebook.com/sharer.php?u='+url; - var buzz = 'https://plus.google.com/share?url='+url; - var tbar = '
Share
Share on TwitterShare on facebookShare on Buzz
'; + var gplus = 'https://plus.google.com/share?url='+url; + var tbar = '
Share
Share on TwitterShare on facebookShare on Google Plus
'; // Add the share tool bar. jQuery('body').append(tbar); var st = jQuery('#socialdrawer'); From 457ef24c0456d4cf0f3b2553f984ec5246fb21a8 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 21 Sep 2012 22:01:51 -0500 Subject: [PATCH 02/78] added missing patch, thanks Niphlod --- VERSION | 2 +- gluon/widget.py | 34 ++++++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index 44f1be1a..486b127c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 09:37:29) stable +Version 2.0.9 (2012-09-21 22:01:45) stable diff --git a/gluon/widget.py b/gluon/widget.py index 890080e6..670583ed 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -955,6 +955,19 @@ def check_existent_app(options,appname): if os.path.isdir(os.path.join(options.folder, 'applications', appname)): return True +def get_code_for_scheduler(app, options): + if len(app) == 1 or app[1] == None: + code = "from gluon import current;current._scheduler.loop()" + else: + code = "from gluon import current;current._scheduler.group_names = ['%s'];" + code += "current._scheduler.loop()" + code = code % ("','".join(app[1:])) + app_ = app[0] + if not check_existent_app(options, app_): + print "Application '%s' doesn't exist, skipping" % (app_) + return None, None + return app_, code + def start_schedulers(options): try: from multiprocessing import Process @@ -965,20 +978,21 @@ def start_schedulers(options): apps = [(app.strip(), None) for app in options.scheduler.split(',')] if options.scheduler_groups: apps = options.scheduler_groups + code = "from gluon import current;current._scheduler.loop()" + logging.getLogger().setLevel(options.debuglevel) + if len(apps) == 1: + app_, code = get_code_for_scheduler(apps[0], options) + if not app_: + return + print 'starting single-scheduler for "%s"...' % app_ + run(app_,True,True,None,False,code) + return for app in apps: - if len(app) == 1 or app[1] == None: - code = "from gluon import current;current._scheduler.loop()" - else: - code = "from gluon import current;current._scheduler.group_names = ['%s'];" - code += "current._scheduler.loop()" - code = code % ("','".join(app[1:])) - app_ = app[0] - if not check_existent_app(options, app_): - print "Application '%s' doesn't exist, skipping" % (app_) + app_, code = get_code_for_scheduler(app, options) + if not app_: continue print 'starting scheduler for "%s"...' % app_ args = (app_,True,True,None,False,code) - logging.getLogger().setLevel(options.debuglevel) p = Process(target=run, args=args) processes.append(p) print "Currently running %s scheduler processes" % (len(processes)) From 480dea23adc7d8c0272148a73651aa87a7b332e1 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 21 Sep 2012 22:12:17 -0500 Subject: [PATCH 03/78] moved entropy JS in PasswordWidget but the source should be moved in separate file --- VERSION | 2 +- applications/welcome/views/default/user.html | 90 +------------------- gluon/sqlhtml.py | 90 +++++++++++++++++++- gluon/validators.py | 4 + 4 files changed, 95 insertions(+), 91 deletions(-) diff --git a/VERSION b/VERSION index 486b127c..bf2638f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:01:45) stable +Version 2.0.9 (2012-09-21 22:12:11) stable diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html index ef00c0e6..47acab1f 100644 --- a/applications/welcome/views/default/user.html +++ b/applications/welcome/views/default/user.html @@ -15,92 +15,4 @@ pass - +//--> diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 5e345f7c..f2382e04 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -433,6 +433,94 @@ class PasswordWidget(FormWidget): DEFAULT_PASSWORD_DISPLAY = 8*('*') + js = """ + function calc_entropy(mystring) { + /*" calculate a simple entropy for a given string "*/ + var lowerset = 'abcdefghijklmnopqrstuvwxyz'; + var upperset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + var numberset = '0123456789'; + var sym1set = '!@#$\%^&*()'; + var sym2set = '~`-_=+[]{}\\|;:\\'",.<>?/'; + var otherset = '0123456789abcdefghijklmnopqrstuvwxyz' + var alphabet = 0; + var other = {}; + var seen = {}; + var lastset = null; + var mystringlist = mystring.split(''); + for (var i=0;i Date: Fri, 21 Sep 2012 22:14:08 -0500 Subject: [PATCH 04/78] fixed share Google+, thanks nicozanf --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bf2638f2..29f9d279 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:12:11) stable +Version 2.0.9 (2012-09-21 22:14:03) stable From e0fc61932d0d1ba259868c9e0cefe07dad418f7b Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 21 Sep 2012 22:23:45 -0500 Subject: [PATCH 05/78] broken long lines in minify --- VERSION | 2 +- gluon/contrib/minify/minify.py | 28 ++++++++++++++++++---------- gluon/globals.py | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index 29f9d279..43cdc7da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:14:03) stable +Version 2.0.9 (2012-09-21 22:23:39) stable diff --git a/gluon/contrib/minify/minify.py b/gluon/contrib/minify/minify.py index 012c9611..54aa3784 100644 --- a/gluon/contrib/minify/minify.py +++ b/gluon/contrib/minify/minify.py @@ -60,16 +60,18 @@ def minify(files, path_info, folder, optimize_css, optimize_js, processed = [] for k,filename in enumerate(files): if not filename.startswith('/') or \ - any(filename.endswith(x) for x in ignore_concat): + any(filename.endswith(x) \ + for x in ignore_concat): new_files.append(filename) continue - abs_filename = os.path.join(folder,'static', - filename[len(static_path)+1:]) + abs_filename = os.path.join( + folder,'static', filename[len(static_path)+1:]) if filename.lower().endswith('.css'): processed.append(filename) - spath_info, sfilename = path_info.split('/'), filename.split('/') + spath_info, sfilename = \ + path_info.split('/'), filename.split('/') u = 0 for i,a in enumerate(sfilename): try: @@ -80,7 +82,8 @@ def minify(files, path_info, folder, optimize_css, optimize_js, pass if concat_css: contents = read_binary_file(abs_filename) - replacement = '../'*len(spath_info[u:]) + '/'.join(sfilename[u:-1]) + '/' + replacement = '../'*len(spath_info[u:]) + \ + '/'.join(sfilename[u:-1]) + '/' contents = fix_links(contents, replacement) if minify_css: css.append(cssmin.cssmin(contents)) @@ -91,9 +94,12 @@ def minify(files, path_info, folder, optimize_css, optimize_js, elif filename.lower().endswith('.js'): processed.append(filename) if concat_js: - contents = read_binary_file(abs_filename) - if minify_js and not filename.endswith('.min.js') and \ - not any(filename.endswith(x) for x in ignore_minify): + contents = read_binary_file(abs_filename) + + if minify_js and \ + not filename.endswith('.min.js') and \ + not any(filename.endswith(x) \ + for x in ignore_minify): js.append(jsmin.jsmin(contents)) else: js.append(contents) @@ -104,7 +110,8 @@ def minify(files, path_info, folder, optimize_css, optimize_js, css = '\n\n'.join(contents for contents in css) if not inline_css: temppath = os.path.join(folder,'static',temp) - if not os.path.exists(temppath): os.mkdir(temppath) + if not os.path.exists(temppath): + os.mkdir(temppath) dest = "compressed_%s.css" % dest_key tempfile = os.path.join(temppath, dest) write_binary_file(tempfile,css) @@ -118,7 +125,8 @@ def minify(files, path_info, folder, optimize_css, optimize_js, js = ('js:inline',js) else: temppath = os.path.join(folder,'static',temp) - if not os.path.exists(temppath): os.mkdir(temppath) + if not os.path.exists(temppath): + os.mkdir(temppath) dest = "compressed_%s.js" % dest_key tempfile = os.path.join(folder,'static',temp,dest) write_binary_file(tempfile,js) diff --git a/gluon/globals.py b/gluon/globals.py index ccaab79f..b153ee90 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -241,7 +241,8 @@ class Response(Storage): files = [] for item in self.files: - if not item in files: files.append(item) + if not item in files: + files.append(item) if have_minify and (self.optimize_css or self.optimize_js): # cache for 5 minutes by default key = hashlib.md5(repr(files)).hexdigest() From e4c63769f2ff2585d8a05e73d658ab80052e8de0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 21 Sep 2012 22:29:55 -0500 Subject: [PATCH 06/78] reverted 4077 because distinct on and groupby are not equivalent. Moreover distinct on is supported only by postgresql because potentially non-deterministic and should be discouraged. Thanks Alexander --- VERSION | 2 +- gluon/dal.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 43cdc7da..2c33c26b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:23:39) stable +Version 2.0.9 (2012-09-21 22:29:49) stable diff --git a/gluon/dal.py b/gluon/dal.py index 857bcf84..4e5c5226 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1457,8 +1457,6 @@ class BaseAdapter(ConnectionPool): having = args_get('having', False) limitby = args_get('limitby', False) for_update = args_get('for_update', False) - if not distinct is True and not distinct is False and not groupby: - distinct, groupby = False, distinct if self.can_select_for_update is False and for_update is True: raise SyntaxError, 'invalid select attribute: for_update' if distinct is True: From 28b94eceb2dcdc75c8ada223aa55f445ffed4af7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 21 Sep 2012 22:49:45 -0500 Subject: [PATCH 07/78] formstyle='inline' for forms with single field --- VERSION | 2 +- gluon/sqlhtml.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2c33c26b..3886a680 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:29:49) stable +Version 2.0.9 (2012-09-21 22:49:39) stable diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index f2382e04..efe4a763 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -770,6 +770,16 @@ def formstyle_divs(form, fields): table.append(DIV(_label, _controls, _help, _id=id)) return table +def formstyle_inline(form, fields): + ''' divs only ''' + if len(fields)!=2: + raise RuntimeError, "Not possible" + id, label, controls, help = fields[0] + submit_button = fields[1][2] + return CAT(DIV(controls,_style='display:inline'), + submit_button) + + def formstyle_ul(form, fields): ''' unordered list ''' table = UL() @@ -895,6 +905,7 @@ class SQLFORM(FORM): divs = formstyle_divs, ul = formstyle_ul, bootstrap = formstyle_bootstrap, + inline = formstyle_inline, )) FIELDNAME_REQUEST_DELETE = 'delete_this_record' From 93ce59f65baa89c611560801efbd80d6d145ee7e Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 22 Sep 2012 09:52:08 -0500 Subject: [PATCH 08/78] moved entropy js back to user.html --- VERSION | 2 +- applications/welcome/views/default/user.html | 92 ++++++++++++++++++++ gluon/sqlhtml.py | 90 +------------------ 3 files changed, 94 insertions(+), 90 deletions(-) diff --git a/VERSION b/VERSION index 3886a680..3c256ede 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-21 22:49:39) stable +Version 2.0.9 (2012-09-22 09:52:01) stable diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html index 47acab1f..eb6f9b06 100644 --- a/applications/welcome/views/default/user.html +++ b/applications/welcome/views/default/user.html @@ -15,4 +15,96 @@ pass + diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index efe4a763..e63a909d 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -433,94 +433,6 @@ class PasswordWidget(FormWidget): DEFAULT_PASSWORD_DISPLAY = 8*('*') - js = """ - function calc_entropy(mystring) { - /*" calculate a simple entropy for a given string "*/ - var lowerset = 'abcdefghijklmnopqrstuvwxyz'; - var upperset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - var numberset = '0123456789'; - var sym1set = '!@#$\%^&*()'; - var sym2set = '~`-_=+[]{}\\|;:\\'",.<>?/'; - var otherset = '0123456789abcdefghijklmnopqrstuvwxyz' - var alphabet = 0; - var other = {}; - var seen = {}; - var lastset = null; - var mystringlist = mystring.split(''); - for (var i=0;i Date: Sat, 22 Sep 2012 09:54:53 -0500 Subject: [PATCH 09/78] restored comments in boostrap_css.css --- VERSION | 2 +- .../welcome/static/css/web2py_bootstrap.css | 100 ++++++++---------- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/VERSION b/VERSION index 3c256ede..be9ea6d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-22 09:52:01) stable +Version 2.0.9 (2012-09-22 09:54:49) stable diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css index 36e9bf0e..ad3e8385 100644 --- a/applications/welcome/static/css/web2py_bootstrap.css +++ b/applications/welcome/static/css/web2py_bootstrap.css @@ -1,8 +1,8 @@ -//======================================================= -// CUSTOM RULES -//======================================================= +/*============================================================= + CUSTOM RULES +==============================================================*/ -body{height:auto;} // to avoid vertical scroll bar +body{height:auto;} /* to avoid vertical scroll bar */ div.flash.flash-center{left:25%;right:25%;} div.flash.flash-top,div.flash.flash-top:hover{ position:relative; @@ -36,18 +36,16 @@ div.flash.flash-top,div.flash.flash-top:hover{ font-size:20px; font-weight:300; } -// auth navbar - primitive style +/* auth navbar - primitive style */ .auth_navbar,.auth_navbar a{color:inherit;} -.ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); // ie7 doesn't support inherit -} -.auth_navbar a{white-space:nowrap;} // to avoid the nav split on more lines +.ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */} +.auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */ .auth_navbar a:hover{color:white;text-decoration:none;} ul#navbar>.auth_navbar{ display:inline-block; padding:5px; } - -// form errors message box customization +/* form errors message box customization */ div.error_wrapper{margin-bottom:9px;} div.error{ border-radius: 4px; @@ -55,9 +53,8 @@ div.error{ -moz-border-radius: 4px; -webkit-border-radius: 4px; } - -// below rules are only for formstyle = bootstrap -// trying to make errors look like bootstrap ones +/* below rules are only for formstyle = bootstrap +trying to make errors look like bootstrap ones */ div.controls .error_wrapper{ display:inline-block; margin-bottom:0; @@ -70,46 +67,44 @@ div.controls .error{ border:none; padding:0; margin:0; - //display:inline; // uncommenting this, the animation effect is lost + //display:inline; /* uncommenting this, the animation effect is lost */ } div.controls .inline-help{color:#3A87AD;} div.controls .error_wrapper+.inline-help{margin-left:-99999px;} - -// beautify brand +/* beautify brand */ .navbar-inverse .brand{color:#c6cecc;} .navbar-inverse .brand b{display:inline-block;margin-top:-1px;} .navbar-inverse .brand b>span{font-size:22px;color:white} .navbar-inverse .brand:hover b>span{color:white} -// beautify web2py link in navbar +/* beautify web2py link in navbar */ span.highlighted{color:#d8d800;} .open span.highlighted{color:#ffff00;} -//=========================================================== -// OVERRIDING WEB2PY.CSS RULES -//=========================================================== +/*============================================================= + OVERRIDING WEB2PY.CSS RULES +==============================================================*/ -// reset to default +/* reset to default */ a{white-space:normal;} li{margin-bottom:0;} textarea,button{display:block;} -// reset ul padding +/*reset ul padding */ ul#navbar{padding:0;} -// label aligned to related input +/* label aligned to related input */ td.w2p_fl,td.w2p_fc {padding:0;} #web2py_user_form td{vertical-align:middle;} -//========================================================== -// OVERRIDING BOOTSTRAP.CSS RULES -//========================================================== +/*============================================================= + OVERRIDING BOOTSTRAP.CSS RULES +==============================================================*/ -// because web2py handles this via js +/* because web2py handles this via js */ .hidden{visibility:visible;} - -// right folder for bootstrap black images/icons +/* right folder for bootstrap black images/icons */ [class^="icon-"],[class*=" icon-"]{ background-image:url("../images/glyphicons-halflings.png") } -// right folder for bootstrap white images/icons +/* right folder for bootstrap white images/icons */ .icon-white, .nav-tabs > .active > a > [class^="icon-"], .nav-tabs > .active > a > [class*=" icon-"], @@ -125,20 +120,20 @@ td.w2p_fl,td.w2p_fc {padding:0;} .dropdown-menu > .active > a > [class*=" icon-"] { background-image:url("../images/glyphicons-halflings-white.png"); } -// bootstrap has a label as input's wrapper while web2py has a div +/* bootstrap has a label as input's wrapper while web2py has a div */ div>input[type="radio"],div>input[type="checkbox"]{margin:0;} -// bootstrap has button instead of input +/* bootstrap has button instead of input */ input[type="button"], input[type="submit"]{margin-right:8px;} -//=========================================================== -// SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS -//=========================================================== +/*============================================================= +RULES FOR SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS +==============================================================*/ -// when formstyle=table3cols +/*when formstyle=table3cols*/ tr#auth_user_remember__row>td.w2p_fw>div{padding-bottom:8px;} td.w2p_fw div>label{vertical-align:middle;} td.w2p_fc {padding-bottom:5px;} -// when formstyle=divs +/*when formstyle=divs*/ div#auth_user_remember__row{margin-top:4px;} div#auth_user_remember__row>.w2p_fl{display:none;} div#auth_user_remember__row>.w2p_fw{min-height:39px;} @@ -151,8 +146,7 @@ div.w2p_fc{ padding-left:5px; margin-top:-8px; } - -// when formstyle=ul +/*when formstyle=ul*/ form>ul{ list-style:none; margin:0; @@ -160,30 +154,28 @@ form>ul{ li#auth_user_remember__row{margin-top:4px;} li#auth_user_remember__row>.w2p_fl{display:none;} li#auth_user_remember__row>.w2p_fw{min-height:39px;} - -// when formstyle=bootstrap +/*when formstyle=bootstrap*/ #auth_user_remember__row label.checkbox{display:block;} span.inline-help{display:inline-block;} input[type="text"].input-xlarge,input[type="password"].input-xlarge{width:270px;} - -// when recaptcha is used +/*when recaptcha is used*/ #recaptcha{min-height:30px;display:inline-block;margin-bottom:0;line-height:30px;vertical-align:middle;} td>#recaptcha{margin-bottom:6px;} div>#recaptcha{margin-bottom:9px;} -//========================================================== -// OTHER RULES -//========================================================== +/*============================================================= + OTHER RULES +==============================================================*/ .navbar-inner{ - position:relative; // unnecessary + position:relative; /*unnecessary ??*/ } - -// fixed alignment in forms with list:string +/* Massimo Di Pierro fixed alignment in forms with list:string */ form table tr{margin-bottom:9px;} td.w2p_fw ul{margin-left:0px;} -// web2py_console in grid and smartgrid +/* web2py_console in grid and smartgrid */ +.hidden{visibility:visible;} .web2py_console input{ display: inline-block; margin-bottom: 0; @@ -203,12 +195,12 @@ td.w2p_fw ul{margin-left:0px;} margin:3px 0 0 2px; } .web2py_grid form table{width:auto;} -// auth_user_remember checkbox extrapadding in IE fix +/* auth_user_remember checkbox extrapadding in IE fix */ .ie-lte9 input#auth_user_remember.checkbox {padding-left:0;} -//=========================================================== -// MEDIA QUERIES -//=========================================================== +/*============================================================= + MEDIA QUERIES +==============================================================*/ @media only screen and (max-width:979px){ body{padding-top:0px;} From 56acb685e9cfced96d6e659b5f66dae039ee2f96 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 22 Sep 2012 10:11:17 -0500 Subject: [PATCH 10/78] removed some duplication of code in dal.py, thanks Mart --- VERSION | 2 +- applications/welcome/static/css/web2py.css | 4 +- gluon/dal.py | 147 +++------------------ 3 files changed, 23 insertions(+), 130 deletions(-) diff --git a/VERSION b/VERSION index be9ea6d2..039e6b2b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-22 09:54:49) stable +Version 2.0.9 (2012-09-22 10:11:13) stable diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index ac04a0f0..1ad43fd0 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -61,7 +61,7 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px} border-top:1px #DEDEDE solid; } .header { - // background:; + /* background:; */ } @@ -182,7 +182,7 @@ div.error { * will look better with the declarations below * if needed to remove base.css consider keeping these following lines in some css file. */ -// .web2py_table {border:1px solid #ccc} +/* .web2py_table {border:1px solid #ccc} */ .web2py_paginator {} .web2py_grid {width:100%} .web2py_grid table {width:100%} diff --git a/gluon/dal.py b/gluon/dal.py index 4e5c5226..f5c686a9 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5167,22 +5167,6 @@ class MongoDBAdapter(NoSQLAdapter): items = [self.expand(item, first.type) for item in second] return {self.expand(first) : {"$in" : items} } - def LIKE(self, first, second): - #escaping regex operators? - return {self.expand(first) : ('%s' % self.expand(second, 'string').replace('%','/'))} - - def STARTSWITH(self, first, second): - #escaping regex operators? - return {self.expand(first) : ('/^%s/' % self.expand(second, 'string'))} - - def ENDSWITH(self, first, second): - #escaping regex operators? - return {self.expand(first) : ('/%s^/' % self.expand(second, 'string'))} - - def CONTAINS(self, first, second): - #There is a technical difference, but mongodb doesn't support that, but the result will be the same - return {self.expand(first) : ('/%s/' % self.expand(second, 'string'))} - def EQ(self,first,second): result = {} #if second is None: @@ -5256,41 +5240,30 @@ class MongoDBAdapter(NoSQLAdapter): raise NotImplementedError, "This is not possible in NoSQL, but can be simulated with a wrapper." return '%s ON %s' % (self.expand(first), self.expand(second)) + # + # BLOW ARE TWO IMPLEMENTATIONS OF THE SAME FUNCITONS + # WHICH ONE IS BEST? + # + def COMMA(self, first, second): return '%s, %s' % (self.expand(first), self.expand(second)) - def bulk_insert(self, table, items): - return [self.insert(table,item) for item in items] + def LIKE(self, first, second): + #escaping regex operators? + return {self.expand(first) : ('%s' % self.expand(second, 'string').replace('%','/'))} - #TODO This will probably not work:( - def NOT(self, first): - result = {} - result["$not"] = self.expand(first) - return result + def STARTSWITH(self, first, second): + #escaping regex operators? + return {self.expand(first) : ('/^%s/' % self.expand(second, 'string'))} - def AND(self,first,second): - f = self.expand(first) - s = self.expand(second) - f.update(s) - return f + def ENDSWITH(self, first, second): + #escaping regex operators? + return {self.expand(first) : ('/%s^/' % self.expand(second, 'string'))} - def OR(self,first,second): - # pymongo expects: .find( {'$or' : [{'name':'1'}, {'name':'2'}] } ) - result = {} - f = self.expand(first) - s = self.expand(second) - result['$or'] = [f,s] - return result + def CONTAINS(self, first, second): + #There is a technical difference, but mongodb doesn't support that, but the result will be the same + return {self.expand(first) : ('/%s/' % self.expand(second, 'string'))} - def BELONGS(self, first, second): - if isinstance(second, str): - return {self.expand(first) : {"$in" : [ second[:-1]]} } - elif second==[] or second==(): - return {1:0} - items = [self.expand(item, first.type) for item in second] - return {self.expand(first) : {"$in" : items} } - - #TODO verify full compatibilty with official SQL Like operator def LIKE(self, first, second): import re return {self.expand(first) : {'$regex' : re.escape(self.expand(second, 'string')).replace('%','.*')}} @@ -5314,89 +5287,9 @@ class MongoDBAdapter(NoSQLAdapter): #TODO contains operators need to be transformed to Regex return {self.expand(first) : {' $regex' : ".*" + re.escape(self.expand(second, 'string')) + ".*"}} - def EQ(self,first,second): - result = {} - #if second is None: - #return '(%s == null)' % self.expand(first) - #return '(%s == %s)' % (self.expand(first),self.expand(second,first.type)) - result[self.expand(first)] = self.expand(second) - return result - - def NE(self, first, second=None): - print "in NE" - result = {} - result[self.expand(first)] = {'$ne': self.expand(second)} - return result - - def LT(self,first,second=None): - if second is None: - raise RuntimeError, "Cannot compare %s < None" % first - print "in LT" - result = {} - result[self.expand(first)] = {'$lt': self.expand(second)} - return result - - def LE(self,first,second=None): - if second is None: - raise RuntimeError, "Cannot compare %s <= None" % first - print "in LE" - result = {} - result[self.expand(first)] = {'$lte': self.expand(second)} - return result - - def GT(self,first,second): - print "in GT" - result = {} - result[self.expand(first)] = {'$gt': self.expand(second)} - return result - - def GE(self,first,second=None): - if second is None: - raise RuntimeError, "Cannot compare %s >= None" % first - print "in GE" - result = {} - result[self.expand(first)] = {'$gte': self.expand(second)} - return result - - #TODO javascript has math - def ADD(self, first, second): - raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry" - return '%s + %s' % (self.expand(first), self.expand(second, first.type)) - - #TODO javascript has math - def SUB(self, first, second): - raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry" - return '(%s - %s)' % (self.expand(first), self.expand(second, first.type)) - - #TODO javascript has math - def MUL(self, first, second): - raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry" - return '(%s * %s)' % (self.expand(first), self.expand(second, first.type)) - #TODO javascript has math - - def DIV(self, first, second): - raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry" - return '(%s / %s)' % (self.expand(first), self.expand(second, first.type)) - #TODO javascript has math - def MOD(self, first, second): - raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry" - return '(%s %% %s)' % (self.expand(first), self.expand(second, first.type)) - - #TODO javascript can do this - def AS(self, first, second): - raise NotImplementedError, "This must yet be replaced with javascript in order to accomplish this. Sorry" - return '%s AS %s' % (self.expand(first), second) - - #We could implement an option that simulates a full featured SQL database. But I think the option should be set explicit or implemented as another library. - def ON(self, first, second): - raise NotImplementedError, "This is not possible in NoSQL, but can be simulated with a wrapper." - return '%s ON %s' % (self.expand(first), self.expand(second)) - - #TODO is this used in mongodb? - def COMMA(self, first, second): - return '%s, %s' % (self.expand(first), self.expand(second)) - - + # + # END REDUNDANCY + # class IMAPAdapter(NoSQLAdapter): drivers = ('imaplib',) From 4d6598c645980ed033a8b6dffadc3d14b6037411 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 22 Sep 2012 11:19:14 -0500 Subject: [PATCH 11/78] fixed typo in validators --- VERSION | 2 +- gluon/validators.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 039e6b2b..a6b55e7f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-22 10:11:13) stable +Version 2.0.9 (2012-09-22 11:19:10) stable diff --git a/gluon/validators.py b/gluon/validators.py index a105ff56..dbf59fc5 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -512,7 +512,7 @@ class IS_IN_DB(Validator): def count(values, s=self.dbset, f=field): return s(f.belongs(map(int,values))).count() if isinstance(self.dbset.db._adapter, GoogleDatastoreAdapter): - range_ids = range(0,len(ids),30) + range_ids = range(0,len(values),30) total = sum(count(values[i:i+30]) for i in range_ids) if total == len(values): return (values, None) From 69a2e76c3ce39276b21acd62150af24cdacebc96 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 23 Sep 2012 14:07:50 -0500 Subject: [PATCH 12/78] entropy check code in web2py.js, thanks Niphlod --- VERSION | 2 +- applications/admin/static/js/web2py.js | 56 +++++++++--- applications/examples/static/js/web2py.js | 56 +++++++++--- applications/welcome/static/js/web2py.js | 52 ++++++++--- applications/welcome/views/default/user.html | 91 +------------------- gluon/sqlhtml.py | 20 +++-- 6 files changed, 142 insertions(+), 135 deletions(-) diff --git a/VERSION b/VERSION index a6b55e7f..c8c7db93 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-22 11:19:10) stable +Version 2.0.9 (2012-09-23 14:07:45) stable diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index 9a2e208c..e323398a 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -39,7 +39,7 @@ function web2py_ajax_init(target) { function web2py_event_handlers() { var doc = jQuery(document) - doc.on('click', '.flash', function(e){jQuery(this).fadeOut('slow'); e.preventDefault();}); + doc.on('click', '.flash', function(e){var t=jQuery(this); if(t.css('top')=='0px') t.slideUp('slow'); else t.fadeOut(); e.preventDefault();}); doc.on('keyup', 'input.integer', function(){this.value=this.value.reverse().replace(/[^0-9\-]|\-(?=.)/g,'').reverse();}); doc.on('keyup', 'input.double, input.decimal', function(){this.value=this.value.reverse().replace(/[^0-9\-\.,]|[\-](?=.)|[\.,](?=[0-9]*[\.,])/g,'').reverse();}); var confirm_message = (typeof w2p_ajax_confirm_message != 'undefined') ? w2p_ajax_confirm_message : "Are you sure you want to delete this object?"; @@ -55,7 +55,7 @@ function web2py_event_handlers() { jQuery(function() { var flash = jQuery('.flash'); flash.hide(); - if(flash.html()) flash.slideDown(); + if(flash.html()) flash.append('×').slideDown(); web2py_ajax_init(document); web2py_event_handlers(); }); @@ -67,20 +67,20 @@ function web2py_trap_form(action,target) { form.submit(function(e){ jQuery('.flash').hide().html(''); web2py_ajax_page('post',action,form.serialize(),target); - e.preventDefault(); + e.preventDefault(); }); }); } function web2py_trap_link(target) { jQuery('#'+target+' a.w2p_trap').each(function(i){ - var link=jQuery(this); - link.click(function(e) { - jQuery('.flash').hide().html(''); - web2py_ajax_page('get',link.attr('href'),[],target); - e.preventDefault(); - }); - }); + var link=jQuery(this); + link.click(function(e) { + jQuery('.flash').hide().html(''); + web2py_ajax_page('get',link.attr('href'),[],target); + e.preventDefault(); + }); + }); } function web2py_ajax_page(method, action, data, target) { @@ -101,9 +101,9 @@ function web2py_ajax_page(method, action, data, target) { web2py_trap_link(target); web2py_ajax_init('#'+target); if(command) - eval(decodeURIComponent(command)); + eval(decodeURIComponent(command)); if(flash) - jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); + jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); } }); } @@ -151,7 +151,7 @@ function web2py_component(action, target, timeout, times){ } } else { // run once (no timeout specified) - element.reload_counter = Infinity; + element.reload_counter = Infinity; web2py_ajax_page('get', action, null, target); } }); } @@ -165,3 +165,33 @@ function web2py_comet(url,onmessage,onopen,onclose) { } else return false; // not supported } + +function web2py_calc_entropy(mystring) { + //calculate a simple entropy for a given string + var csets = new Array( + 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', + '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/', + '0123456789abcdefghijklmnopqrstuvwxyz'); + var score = 0, other = {}, seen = {}, lastset = null, mystringlist = mystring.split(''); + for (var i=0;i×').slideDown(); web2py_ajax_init(document); web2py_event_handlers(); }); @@ -67,20 +67,20 @@ function web2py_trap_form(action,target) { form.submit(function(e){ jQuery('.flash').hide().html(''); web2py_ajax_page('post',action,form.serialize(),target); - e.preventDefault(); + e.preventDefault(); }); }); } function web2py_trap_link(target) { jQuery('#'+target+' a.w2p_trap').each(function(i){ - var link=jQuery(this); - link.click(function(e) { - jQuery('.flash').hide().html(''); - web2py_ajax_page('get',link.attr('href'),[],target); - e.preventDefault(); - }); - }); + var link=jQuery(this); + link.click(function(e) { + jQuery('.flash').hide().html(''); + web2py_ajax_page('get',link.attr('href'),[],target); + e.preventDefault(); + }); + }); } function web2py_ajax_page(method, action, data, target) { @@ -101,9 +101,9 @@ function web2py_ajax_page(method, action, data, target) { web2py_trap_link(target); web2py_ajax_init('#'+target); if(command) - eval(decodeURIComponent(command)); + eval(decodeURIComponent(command)); if(flash) - jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); + jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); } }); } @@ -151,7 +151,7 @@ function web2py_component(action, target, timeout, times){ } } else { // run once (no timeout specified) - element.reload_counter = Infinity; + element.reload_counter = Infinity; web2py_ajax_page('get', action, null, target); } }); } @@ -165,3 +165,33 @@ function web2py_comet(url,onmessage,onopen,onclose) { } else return false; // not supported } + +function web2py_calc_entropy(mystring) { + //calculate a simple entropy for a given string + var csets = new Array( + 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', + '0123456789', '!@#$\%^&*()', '~`-_=+[]{}\|;:\'",.<>?/', + '0123456789abcdefghijklmnopqrstuvwxyz'); + var score = 0, other = {}, seen = {}, lastset = null, mystringlist = mystring.split(''); + for (var i=0;i?/', + '0123456789abcdefghijklmnopqrstuvwxyz'); + var score = 0, other = {}, seen = {}, lastset = null, mystringlist = mystring.split(''); + for (var i=0;i - diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index e63a909d..2fbf3c14 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -28,7 +28,7 @@ from dal import DAL, Field, Table, Row, CALLABLETYPES, smart_query, \ from storage import Storage from utils import md5_hash from validators import IS_EMPTY_OR, IS_NOT_EMPTY, IS_LIST_OF, IS_DATE, \ - IS_DATETIME, IS_INT_IN_RANGE, IS_FLOAT_IN_RANGE + IS_DATETIME, IS_INT_IN_RANGE, IS_FLOAT_IN_RANGE, IS_STRONG import datetime import urllib @@ -442,14 +442,23 @@ class PasswordWidget(FormWidget): see also: :meth:`FormWidget.widget` """ - + # detect if attached a IS_STRONG with entropy default=dict( _type='password', _value=(value and cls.DEFAULT_PASSWORD_DISPLAY) or '', ) attr = cls._attributes(field, default, **attributes) + output = CAT(INPUT(**attr)) - return INPUT(**attr) + # deal with entropy check! + requires = field.requires + if not isinstance(requires,(list,tuple)): requires = [requires] + is_strong = [r for r in requires if isinstance(r, IS_STRONG)] + if is_strong: + output.append(SCRIPT("web2py_validate_entropy(jQuery('#%s'),%s);" \ + % (attr['_id'],is_strong[0].entropy))) + # end entropy check + return output class UploadWidget(FormWidget): @@ -2713,8 +2722,3 @@ class ExporterXML(ExportClass): out.write('\n') out.write('') return str(out.getvalue()) - - - - - From 5f647a46b856fa6b1935d0d5b6935a028036ebcc Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 23 Sep 2012 14:37:50 -0500 Subject: [PATCH 13/78] moved layout.js in web2py_bootstrap.js and include_files(extensions=[...]), thanks Jeremy --- VERSION | 2 +- .../welcome/static/js/web2py_bootstrap.js | 23 +++++++++++++++ applications/welcome/views/layout.html | 28 ++----------------- gluon/globals.py | 18 +++++++++--- 4 files changed, 40 insertions(+), 31 deletions(-) create mode 100644 applications/welcome/static/js/web2py_bootstrap.js diff --git a/VERSION b/VERSION index c8c7db93..0b83584a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-23 14:07:45) stable +Version 2.0.9 (2012-09-23 14:37:46) stable diff --git a/applications/welcome/static/js/web2py_bootstrap.js b/applications/welcome/static/js/web2py_bootstrap.js new file mode 100644 index 00000000..8c762296 --- /dev/null +++ b/applications/welcome/static/js/web2py_bootstrap.js @@ -0,0 +1,23 @@ +// this code improves bootstrap menus and adds dropdown support +jQuery(function(){ + jQuery('.nav>li>a').each(function(){ + if(jQuery(this).parent().find('ul').length) + jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append(''); + }); + jQuery('.nav li li').each(function(){ + if(jQuery(this).find('ul').length) + jQuery(this).addClass('dropdown-submenu'); + }); + if(jQuery(document).width()>=980) { + jQuery('ul.nav a.dropdown-toggle').parent().hover(function() { + mi = jQuery(this).addClass('open'); + mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400); + }, function() { + mi = jQuery(this); + mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')}); + }); + } + jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');}); + // make all buttons bootstrap buttons + jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn'); +}); diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index 19225730..576903c9 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -39,7 +39,7 @@ - {{ + {{ response.files.append(URL('static','css/web2py.css')) response.files.append(URL('static','css/bootstrap.min.css')) response.files.append(URL('static','css/bootstrap-responsive.min.css')) @@ -146,32 +146,8 @@ - + - + web2py™ 
From dd4a4c281fe88e8bd55a5533630c17e9ab64635f Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 09:53:46 -0500 Subject: [PATCH 55/78] prettidate works with future dates, thanks Sanjoy --- VERSION | 2 +- gluon/tools.py | 33 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/VERSION b/VERSION index da20e539..9c5d45a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-28 20:19:52) dev +Version 2.0.9 (2012-09-29 09:53:38) dev diff --git a/gluon/tools.py b/gluon/tools.py index e1016c45..d783e6d7 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4342,34 +4342,39 @@ def prettydate(d,T=lambda x:x): return '' else: return '[invalid date]' + if dt.days < 0: + suffix = ' from now' + dt = -dt + else: + suffix = ' ago' if dt.days >= 2*365: - return T('%d years ago') % int(dt.days / 365) + return T('%d years'+suffix) % int(dt.days / 365) elif dt.days >= 365: - return T('1 year ago') + return T('1 year'+suffix) elif dt.days >= 60: - return T('%d months ago') % int(dt.days / 30) + return T('%d months'+suffix) % int(dt.days / 30) elif dt.days > 21: - return T('1 month ago') + return T('1 month'+suffix) elif dt.days >= 14: - return T('%d weeks ago') % int(dt.days / 7) + return T('%d weeks'+suffix) % int(dt.days / 7) elif dt.days >= 7: - return T('1 week ago') + return T('1 week'+suffix) elif dt.days > 1: - return T('%d days ago') % dt.days + return T('%d days'+suffix) % dt.days elif dt.days == 1: - return T('1 day ago') + return T('1 day'+suffix) elif dt.seconds >= 2*60*60: - return T('%d hours ago') % int(dt.seconds / 3600) + return T('%d hours'+suffix) % int(dt.seconds / 3600) elif dt.seconds >= 60*60: - return T('1 hour ago') + return T('1 hour'+suffix) elif dt.seconds >= 2*60: - return T('%d minutes ago') % int(dt.seconds / 60) + return T('%d minutes'+suffix) % int(dt.seconds / 60) elif dt.seconds >= 60: - return T('1 minute ago') + return T('1 minute'+suffix) elif dt.seconds > 1: - return T('%d seconds ago') % dt.seconds + return T('%d seconds'+suffix) % dt.seconds elif dt.seconds == 1: - return T('1 second ago') + return T('1 second'+suffix) else: return T('now') From 492a0c51d1f179f77e7e983ab4a017a4e9482951 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 09:55:57 -0500 Subject: [PATCH 56/78] fixed copy.copy(storage), thanks Corne --- VERSION | 2 +- gluon/storage.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 9c5d45a1..822b46bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 09:53:38) dev +Version 2.0.9 (2012-09-29 09:55:50) dev diff --git a/gluon/storage.py b/gluon/storage.py index 5a985ca4..081e7447 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -46,7 +46,8 @@ class Storage(dict): __repr__ = lambda self: '' % dict.__repr__(self) # http://stackoverflow.com/questions/5247250/why-does-pickle-getstate-accept-as-a-return-value-the-very-instance-it-requi __getstate__ = lambda self: None - + __reduce_ex__ = None + def getlist(self,key): """ Return a Storage value as a list. From cd955d3603c1859e09b9ee844cc66909ca6c997a Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 10:17:06 -0500 Subject: [PATCH 57/78] fixed issue 1046, thanks Houdini --- VERSION | 2 +- gluon/main.py | 16 +++++++++++----- gluon/rocket.py | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 822b46bc..7132c165 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 09:55:50) dev +Version 2.0.9 (2012-09-29 10:16:59) dev diff --git a/gluon/main.py b/gluon/main.py index 00cb9fd8..459ccf89 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -153,7 +153,10 @@ def copystream_progress(request, chunk_size= 10**5): if not env.content_length: return cStringIO.StringIO() source = env.wsgi_input - size = int(env.content_length) + try: + size = int(env.content_length) + except ValueError: + raise HTTP(400,"Invalid Content-Length header") dest = tempfile.TemporaryFile() if not 'X-Progress-ID' in request.vars: copystream(source, dest, size, chunk_size) @@ -424,13 +427,16 @@ def wsgibase(environ, responder): local_hosts = [http_host,'::1','127.0.0.1', '::ffff:127.0.0.1'] if not global_settings.web2py_runtime_gae: - local_hosts.append(socket.gethostname()) + try: + local_hosts.append(socket.gethostname()) + except TypeError: + pass try: local_hosts.append( - socket.gethostbyname(http_host)) - except socket.gaierror: + socket.gethostbyname(http_host)) + except (socket.gaierror,TypeError): pass - client = get_client(env) + client = get_client(env) x_req_with = str(env.http_x_requested_with).lower() request.update( diff --git a/gluon/rocket.py b/gluon/rocket.py index 43284a21..0e44514b 100644 --- a/gluon/rocket.py +++ b/gluon/rocket.py @@ -1468,7 +1468,7 @@ class Worker(Thread): except UnicodeDecodeError: self.err_log.warning('Client sent invalid header: ' + repr(l)) - if l == '\r\n': + if l.strip() == '': break if l[0] in ' \t' and lname: From 1a43e1671f95b77dddec83a4ed1a777cb58a7a5c Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 17:16:35 -0500 Subject: [PATCH 58/78] more web2py_uuid speedup, thanks Michele --- VERSION | 2 +- gluon/utils.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 7132c165..72a1f297 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 10:16:59) dev +Version 2.0.9 (2012-09-29 17:16:28) dev diff --git a/gluon/utils.py b/gluon/utils.py index 9d2f96a9..f3831d3b 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -10,6 +10,7 @@ This file specifically includes utilities for security. """ import string +import struct import hashlib import hmac import uuid @@ -126,8 +127,9 @@ your system does not provide a cryptographically secure entropy source. This is not specific to web2py; consider deploying on a different operating system.""") return ctokens CTOKENS = initialize_urandom() +UNPACKED_CTOKENS = struct.unpack('=QQ',string.join((chr(x) for x in CTOKENS),'')) -def web2py_uuid(): +def web2py_uuid(ctokens=UNPACKED_CTOKENS): """ This function follows from the following discussion: http://groups.google.com/group/web2py-developers/browse_thread/thread/7fd5789a7da3f09 @@ -135,11 +137,18 @@ def web2py_uuid(): It works like uuid.uuid4 except that tries to use os.urandom() if possible and it XORs the output with the tokens uniquely associated with this machine. """ + rand_longs = struct.unpack('=QQ', bytes(bytearray( + random.randrange(256) for i in xrange(16)))) try: - bytes = string.join(map(lambda ur, ctoken: chr(random.randrange(256)^ord(ur)^ctoken), os.urandom(16),CTOKENS),'') + urand_longs = struct.unpack('=QQ', os.urandom(16)) + byte_s = struct.pack('=QQ', + rand_longs[0]^urand_longs[0]^ctokens[0], + rand_longs[1]^urand_longs[1]^ctokens[1]) except NotImplementedError: - bytes = string.join(map(lambda ctoken: chr(random.randrange(256)^ctoken), CTOKENS),'') - return str(uuid.UUID(bytes=bytes, version=4)) + byte_s = struct.pack('=QQ', + rand_longs[0]^ctokens[0], + rand_longs[1]^ctokens[1]) + return str(uuid.UUID(bytes=byte_s, version=4)) REGEX_IPv4 = re.compile('(\d+)\.(\d+)\.(\d+)\.(\d+)') From 60a043479cae87e2d9a72646ce0bdcae0ec908f1 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 17:56:43 -0500 Subject: [PATCH 59/78] yet faster web2py_uuid by caching urandom results --- VERSION | 2 +- gluon/utils.py | 34 +++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 72a1f297..68ca3e72 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 17:16:28) dev +Version 2.0.9 (2012-09-29 17:56:36) dev diff --git a/gluon/utils.py b/gluon/utils.py index f3831d3b..687eeead 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -10,6 +10,7 @@ This file specifically includes utilities for security. """ import string +import threading import struct import hashlib import hmac @@ -110,6 +111,7 @@ def initialize_urandom(): random.seed(node_id + microseconds) try: os.urandom(1) + have_urandom = True try: # try to add process-specific entropy frandom = open('/dev/urandom','wb') @@ -121,13 +123,31 @@ def initialize_urandom(): # works anyway pass except NotImplementedError: + have_urandom = False logger.warning( """Cryptographically secure session management is not possible on your system because your system does not provide a cryptographically secure entropy source. This is not specific to web2py; consider deploying on a different operating system.""") - return ctokens -CTOKENS = initialize_urandom() -UNPACKED_CTOKENS = struct.unpack('=QQ',string.join((chr(x) for x in CTOKENS),'')) + unpacked_ctokens = struct.unpack('=QQ',string.join( + (chr(x) for x in ctokens),'')) + return unpacked_ctokens, have_urandom +UNPACKED_CTOKENS, HAVE_URANDOM = initialize_urandom() + +def fast_urandom16(urandom=[], locker = threading.RLock()): + """ + this is 4x faster than calling os.urandom(16) and prevents + the "too many files open" issue with concurrent access to os.urandom() + """ + try: + return urandom.pop() + except IndexError: + try: + locker.acquire() + ur = os.urandom(16*1024) + urandom += [ur[i:i+16] for i in xrange(16,1024*16,16)] + return ur[0:16] + finally: + locker.release() def web2py_uuid(ctokens=UNPACKED_CTOKENS): """ @@ -139,12 +159,12 @@ def web2py_uuid(ctokens=UNPACKED_CTOKENS): """ rand_longs = struct.unpack('=QQ', bytes(bytearray( random.randrange(256) for i in xrange(16)))) - try: - urand_longs = struct.unpack('=QQ', os.urandom(16)) - byte_s = struct.pack('=QQ', + if HAVE_URANDOM: + urand_longs = struct.unpack('=QQ', fast_urandom16()) + byte_s = struct.pack('=QQ', rand_longs[0]^urand_longs[0]^ctokens[0], rand_longs[1]^urand_longs[1]^ctokens[1]) - except NotImplementedError: + else: byte_s = struct.pack('=QQ', rand_longs[0]^ctokens[0], rand_longs[1]^ctokens[1]) From 57ad1ec1cf884d8a266c7727d0dc3b84318cb829 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 18:35:09 -0500 Subject: [PATCH 60/78] made new web2py_uuid working on python 2.5 --- VERSION | 2 +- gluon/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 68ca3e72..bbdee3ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 17:56:36) dev +Version 2.0.9 (2012-09-29 18:35:01) dev diff --git a/gluon/utils.py b/gluon/utils.py index 687eeead..94376894 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -157,8 +157,8 @@ def web2py_uuid(ctokens=UNPACKED_CTOKENS): It works like uuid.uuid4 except that tries to use os.urandom() if possible and it XORs the output with the tokens uniquely associated with this machine. """ - rand_longs = struct.unpack('=QQ', bytes(bytearray( - random.randrange(256) for i in xrange(16)))) + rand_longs = struct.unpack('=QQ', string.join( + (chr(random.randrange(256)) for i in xrange(16)),'')) if HAVE_URANDOM: urand_longs = struct.unpack('=QQ', fast_urandom16()) byte_s = struct.pack('=QQ', From 07c667f469d40e948d95f0e6eb49e2a551b700e4 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 18:39:53 -0500 Subject: [PATCH 61/78] better rocket parsing, support for multiline headers --- VERSION | 2 +- gluon/rocket.py | 36 ++++++++++++++++-------------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index bbdee3ed..d420015d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 18:35:01) dev +Version 2.0.9 (2012-09-29 18:39:44) dev diff --git a/gluon/rocket.py b/gluon/rocket.py index 0e44514b..05d6da6c 100644 --- a/gluon/rocket.py +++ b/gluon/rocket.py @@ -1457,33 +1457,29 @@ class Worker(Thread): def read_headers(self, sock_file): try: headers = dict() - l = sock_file.readline() - - lname = None - lval = None + lname = lval = '' while True: + line = sock_file.readline() if PY3K: try: - l = str(l, 'ISO-8859-1') + line = str(line, 'ISO-8859-1') except UnicodeDecodeError: - self.err_log.warning('Client sent invalid header: ' + repr(l)) - - if l.strip() == '': + self.err_log.warning('Client sent invalid header: ' + repr(line)) + if line == '\r\n': + if lname: headers[str(lname)] = str(lval) break - - if l[0] in ' \t' and lname: + elif line.strip() == '' or '\0' in line: + raise BadRequest("Empty line in hader") + elif line[0] in ' \t' and lname: # Some headers take more than one line - lval += ',' + l.strip() - else: - # HTTP header values are latin-1 encoded - l = l.split(':', 1) + lval += ' ' + line.strip() + elif ':' in line: + if lname: headers[str(lname)] = str(lval) + lname, lval = line.split(':', 1) # HTTP header names are us-ascii encoded - - lname = l[0].strip().upper().replace('-', '_') - lval = l[-1].strip() - headers[str(lname)] = str(lval) - - l = sock_file.readline() + lname = lname.strip().upper().replace('-', '_') + # HTTP header values are latin-1 encoded + lval = lval.strip() except socket.timeout: raise SocketTimeout("Socket timed out before request.") From 7712e005c4f657ded43ceef1e0633fc90a55fde9 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 20:20:03 -0500 Subject: [PATCH 62/78] MemcacheClient(time_expire=3600) --- VERSION | 2 +- gluon/contrib/memcache/__init__.py | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index d420015d..adcd2977 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 18:39:44) dev +Version 2.0.9 (2012-09-29 20:19:54) dev diff --git a/gluon/contrib/memcache/__init__.py b/gluon/contrib/memcache/__init__.py index 15817bcb..68900695 100644 --- a/gluon/contrib/memcache/__init__.py +++ b/gluon/contrib/memcache/__init__.py @@ -26,8 +26,10 @@ class MemcacheClientObj(Client): def __init__(self, request, servers, debug=0, pickleProtocol=0, pickler=pickle.Pickler, unpickler=pickle.Unpickler, - pload=None, pid=None): + pload=None, pid=None, + default_time_expire = DEFAULT_TIME_EXPIRE): self.request=request + self.default_time_expire = time_expire if request: app = request.application else: @@ -43,8 +45,9 @@ class MemcacheClientObj(Client): else: self.storage = self.meta_storage[app] - def __call__(self, key, f, - time_expire=DEFAULT_TIME_EXPIRE): + def __call__(self, key, f, time_expire = 'default'): + if time_expire == 'default': + time_expire = self.default_time_expire if time_expire == None: time_expire = self.max_time_expire # this must be commented because get and set are redefined @@ -70,8 +73,10 @@ class MemcacheClientObj(Client): self.set(key, (now,value), self.max_time_expire) return value - def increment(self, key, value=1, time_expire=DEFAULT_TIME_EXPIRE): + def increment(self, key, value=1, time_expire='default'): """ time_expire is ignored """ + if time_expire == 'default': + time_expire = self.default_time_expire newKey = self.__keyFormat__(key) obj = Client.get(self, newKey) if obj: @@ -86,7 +91,9 @@ class MemcacheClientObj(Client): Client.set(self, newKey, value, self.max_time_expire) return value - def set(self, key, value, time_expire=DEFAULT_TIME_EXPIRE): + def set(self, key, value, time_expire='default'): + if time_expire == 'default': + time_expire = self.default_time_expire newKey = self.__keyFormat__(key) return Client.set(self, newKey, value, time_expire) From bba13becd0d5bb785b4b91ed69ec38cabfc7bffc Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 20:59:50 -0500 Subject: [PATCH 63/78] in dal renamed thread to thread_local --- VERSION | 2 +- gluon/dal.py | 49 +++++++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/VERSION b/VERSION index adcd2977..eb0866b2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 20:19:54) dev +Version 2.0.9 (2012-09-29 20:59:43) dev diff --git a/gluon/dal.py b/gluon/dal.py index 43f2e783..2415785d 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -191,7 +191,6 @@ osetattr = object.__setattr__ exists = os.path.exists pjoin = os.path.join - ################################################################################### # following checks allow the use of dal without web2py, as a standalone module ################################################################################### @@ -223,7 +222,7 @@ logger = logging.getLogger("web2py.dal") DEFAULT = lambda:0 sql_locker = threading.RLock() -thread = threading.local() +thread_local = threading.local() # internal representation of tables with field # ., tables and fields may only be [a-zA-Z0-9_] @@ -494,16 +493,16 @@ class ConnectionPool(object): @staticmethod def set_folder(folder): - thread.folder = folder + thread_local.folder = folder # ## this allows gluon to commit/rollback all dbs in this thread @staticmethod def close_all_instances(action): """ to close cleanly databases in a multithreaded environment """ - if hasattr(thread, 'instances'): - while thread.instances: - instance = thread.instances.pop() + if hasattr(thread_local, 'instances'): + while thread_local.instances: + instance = thread_local.instances.pop() if action: if callable(action): action(instance) @@ -527,10 +526,7 @@ class ConnectionPool(object): def find_or_make_work_folder(self): """ this actually does not make the folder. it has to be there """ - if hasattr(thread,'folder'): - self.folder = thread.folder - else: - self.folder = thread.folder = '' + self.folder = getattr(thread_local,'folder','') # Creating the folder if it does not exist if False and self.folder and not exists(self.folder): @@ -580,9 +576,9 @@ class ConnectionPool(object): self.connection = f() self.cursor = cursor and self.connection.cursor() break - if not hasattr(thread,'instances'): - thread.instances = [] - thread.instances.append(self) + if not hasattr(thread_local,'instances'): + thread_local.instances = [] + thread_local.instances.append(self) ################################################################################### @@ -659,7 +655,7 @@ class BaseAdapter(ConnectionPool): os.unlink(filename) def find_driver(self,adapter_args,uri=None): - if hasattr(self,'driver') and self.driver!=None: + if getattr(self,'driver',None) != None: return drivers_available = [driver for driver in self.drivers if driver in globals()] @@ -4017,7 +4013,7 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): self.uri = uri self.pool_size = pool_size self.db_codec = db_codec - self.folder = folder or pjoin('$HOME',thread.folder.split( + self.folder = folder or pjoin('$HOME',thread_local.folder.split( os.sep+'applications'+os.sep,1)[1]) ruri = uri.split("://")[1] m = self.REGEX_URI.match(ruri) @@ -5560,9 +5556,9 @@ class IMAPAdapter(NoSQLAdapter): self.cursor = cursor and self.connection.cursor() break - if not hasattr(thread,'instances'): - thread.instances = [] - thread.instances.append(self) + if not hasattr(thread_local,'instances'): + thread_local.instances = [] + thread_local.instances.append(self) def get_last_message(self, tablename): last_message = None @@ -6575,7 +6571,6 @@ def smart_query(fields,text): field = op = neg = logic = None return query - class DAL(object): """ @@ -6588,6 +6583,16 @@ class DAL(object): Field('fieldname2')) """ + #def __new__(cls, uri, *args, **kwargs): + # if not hasattr(thread_local,'db_instances'): + # thread_local.db_instances = {} + # try: + # return thread_local.db_instances[uri] + # except KeyError: + # instance = super(DAL, cls).__new__(cls, uri, *args, **kwargs) + # thread_local.db_instances[uri] = instance + # return instance + @staticmethod def set_folder(folder): """ @@ -6633,7 +6638,6 @@ class DAL(object): db._adapter.commit_prepared(keys[i]) return - def __init__(self, uri='sqlite://dummy.db', pool_size=0, folder=None, db_codec='UTF-8', check_reserved=None, @@ -6668,6 +6672,7 @@ class DAL(object): :fake_migrate_all (defaults to False). If sets to True fake migrates ALL tables :attempts (defaults to 5). Number of times to attempt connecting """ + if not decode_credentials: credential_decoder = lambda cred: cred else: @@ -7129,8 +7134,8 @@ def index(): def close(self): adapter = self._adapter - if adapter in thread.instances: - thread.instances.remove(adapter) + if adapter in thread_local.instances: + thread_local.instances.remove(adapter) adapter.close() def executesql(self, query, placeholders=None, as_dict=False, From 4745ce42f97ea27a9adb1980b895d2adf43d1985 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 22:33:18 -0500 Subject: [PATCH 64/78] DAL is now a pickeable singleton --- VERSION | 2 +- gluon/dal.py | 59 ++++++++++++++++++++++++++++------------- gluon/tests/test_dal.py | 4 +++ 3 files changed, 46 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index eb0866b2..ae03788d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 20:59:43) dev +Version 2.0.9 (2012-09-29 22:33:02) dev diff --git a/gluon/dal.py b/gluon/dal.py index 2415785d..03efad23 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -519,6 +519,8 @@ class ConnectionPool(object): sql_locker.release() if really: getattr(instance, 'close')() + if instance.db._singleton_code in thread_local.db_instances: + del thread_local.db_instances[instance.db._singleton_code] if callable(action): action(None) @@ -6583,15 +6585,23 @@ class DAL(object): Field('fieldname2')) """ - #def __new__(cls, uri, *args, **kwargs): - # if not hasattr(thread_local,'db_instances'): - # thread_local.db_instances = {} - # try: - # return thread_local.db_instances[uri] - # except KeyError: - # instance = super(DAL, cls).__new__(cls, uri, *args, **kwargs) - # thread_local.db_instances[uri] = instance - # return instance + def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs): + if not hasattr(thread_local,'db_instances'): + thread_local.db_instances = {} + if 'singleton_code' in kwargs: + singleton_code = kwargs['singleton_code'] + del kwargs['singleton_code'] + else: + singleton_code = hashlib.md5(uri).hexdigest() + try: + db = thread_local.db_instances[singleton_code] + if args or kwargs: + raise RuntimeError, 'Cannot duplicate a Singleton' + except KeyError: + db = super(DAL, cls).__new__(cls, uri, *args, **kwargs) + db._singleton_code = singleton_code + thread_local.db_instances[singleton_code] = db + return db @staticmethod def set_folder(folder): @@ -6673,6 +6683,10 @@ class DAL(object): :attempts (defaults to 5). Number of times to attempt connecting """ + if hasattr(self,'_adapter'): return + + print 'in init' + if not decode_credentials: credential_decoder = lambda cred: cred else: @@ -7136,6 +7150,8 @@ def index(): adapter = self._adapter if adapter in thread_local.instances: thread_local.instances.remove(adapter) + if self._singleton_code in thread_local.db_instances: + del thread_local.db_instances[self._singleton_code] adapter.close() def executesql(self, query, placeholders=None, as_dict=False, @@ -7265,6 +7281,14 @@ def index(): self[tablename].import_from_csv_file( ifile, id_map, null, unique, id_offset, *args, **kwargs) +def DAL_unpickler(uri): + return DAL(uri) + +def DAL_pickler(db): + return DAL_unpickler, (db._uri,) + +copy_reg.pickle(DAL, DAL_pickler, DAL_unpickler) + class SQLALL(object): """ Helper class providing a comma-separated string having all the field names @@ -9218,15 +9242,14 @@ class Rows(object): import gluon.contrib.simplejson as simplejson return simplejson.dumps(items) -def Rows_unpickler(data): - return cPickle.loads(data) - -def Rows_pickler(data): - return Rows_unpickler, \ - (cPickle.dumps(data.as_list(storage_to_dict=False, - datetime_to_str=False)),) - -copy_reg.pickle(Rows, Rows_pickler, Rows_unpickler) +# def Rows_unpickler(data): +# return cPickle.loads(data) +# +# def Rows_pickler(data): +# return Rows_unpickler, \ +# (cPickle.dumps(data.as_list(storage_to_dict=False, +# datetime_to_str=False)),) +# copy_reg.pickle(Rows, Rows_pickler, Rows_unpickler) ################################################################################ diff --git a/gluon/tests/test_dal.py b/gluon/tests/test_dal.py index fee8842f..b639c5e7 100644 --- a/gluon/tests/test_dal.py +++ b/gluon/tests/test_dal.py @@ -448,18 +448,22 @@ class TestMigrations(unittest.TestCase): db = DAL('sqlite://.storage.db') db.define_table('t', Field('a'), migrate='.storage.table') db.commit() + db.close() db = DAL('sqlite://.storage.db') db.define_table('t', Field('a'), Field('b'), migrate='.storage.table') db.commit() + db.close() db = DAL('sqlite://.storage.db') db.define_table('t', Field('a'), Field('b', 'text'), migrate='.storage.table') db.commit() + db.close() db = DAL('sqlite://.storage.db') db.define_table('t', Field('a'), migrate='.storage.table') db.t.drop() db.commit() + db.close() def tearDown(self): if os.path.exists('.storage.db'): From d0d8a4827e922b0404876d6264bc15f3c8e3e2ef Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 23:20:37 -0500 Subject: [PATCH 65/78] pickle.dumps(db(query).select() now always works and loads restore the full object (almost) --- VERSION | 2 +- gluon/dal.py | 46 +++++++++++++++++++++------------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/VERSION b/VERSION index ae03788d..92895471 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 22:33:02) dev +Version 2.0.9 (2012-09-29 23:20:28) dev diff --git a/gluon/dal.py b/gluon/dal.py index 03efad23..5f343bb6 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1947,7 +1947,7 @@ class BaseAdapter(ConnectionPool): db._referee_name % dict( table=rfield.tablename,field=rfield.name) if referee_link and not referee_link in colset: - colset[referee_link] = Set(db,rfield == id) + colset[referee_link] = LazySet(rfield,id) else: if not '_extra' in new_row: new_row['_extra'] = Row() @@ -6445,15 +6445,6 @@ class Row(object): del d[k] return d -def Row_unpickler(data): - return Row(cPickle.loads(data)) - -def Row_pickler(data): - return Row_unpickler, (cPickle.dumps(data.as_dict(datetime_to_str=False)),) - -copy_reg.pickle(Row, Row_pickler, Row_unpickler) - - ################################################################################ # Everything below should be independent of the specifics of the database # and should work for RDBMs and some NoSQL databases @@ -6685,8 +6676,6 @@ class DAL(object): if hasattr(self,'_adapter'): return - print 'in init' - if not decode_credentials: credential_decoder = lambda cred: cred else: @@ -8849,10 +8838,12 @@ class Set(object): class RecordUpdater(object): def __init__(self, colset, table, id): - self.colset, self.table, self.id = colset, table, id + self.colset, self.db, self.tablename, self.id = \ + colset, table._db, table._tablename, id def __call__(self, **fields): - colset, table, id = self.colset, self.table, self.id + colset, db, tablename, id = self.colset, self.db, self.tablename, self.id + table = db[tablename] newfields = fields or dict(colset) for fieldname in newfields.keys(): if not fieldname in table.fields or table[fieldname].type=='id': @@ -8863,9 +8854,23 @@ class RecordUpdater(object): class RecordDeleter(object): def __init__(self, table, id): - self.table, self.id = table,id + self.db, self.tablename, self.id = table._db, table._tablename, id def __call__(self): - return self.table._db(self.table._id==self.id).delete() + return self.db(self.db[self.tablename]._id==self.id).delete() + +class LazySet(object): + def __init__(self, field, id): + self.db, self.tablename, self.fieldname, self.id = \ + field.db, field._tablename, field.name, id + def _getset(self): + query = self.db[self.tablename][self.fieldname]==self.id + return Set(self.db,query) + def select(self,*a,**b): + return self._getset().select(*a,**b) + def delete(self,*a,**b): + return self._getset().update(*a,**b) + def __call__(self,*a,**b): + return self._getset()(*a,**b) class VirtualCommand(object): @@ -9242,15 +9247,6 @@ class Rows(object): import gluon.contrib.simplejson as simplejson return simplejson.dumps(items) -# def Rows_unpickler(data): -# return cPickle.loads(data) -# -# def Rows_pickler(data): -# return Rows_unpickler, \ -# (cPickle.dumps(data.as_list(storage_to_dict=False, -# datetime_to_str=False)),) -# copy_reg.pickle(Rows, Rows_pickler, Rows_unpickler) - ################################################################################ # dummy function used to define some doctests From 853c0b1a3ab64e47c43b9d117cef924ce67b85a3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 23:38:07 -0500 Subject: [PATCH 66/78] Better LazySet --- VERSION | 2 +- gluon/dal.py | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 92895471..c956db9c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 23:20:28) dev +Version 2.0.9 (2012-09-29 23:38:00) dev diff --git a/gluon/dal.py b/gluon/dal.py index 5f343bb6..bb2f4388 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8865,13 +8865,36 @@ class LazySet(object): def _getset(self): query = self.db[self.tablename][self.fieldname]==self.id return Set(self.db,query) - def select(self,*a,**b): - return self._getset().select(*a,**b) - def delete(self,*a,**b): - return self._getset().update(*a,**b) - def __call__(self,*a,**b): - return self._getset()(*a,**b) - + def __repr__(self): + return repr(self._getset()) + def __call__(self, query, ignore_common_filters=False): + return self._getset()(query, ignore_common_filters) + def _count(self,distinct=None): + return self._getset()._count(distinct) + def _select(self, *fields, **attributes): + return self._getset()._select(*field,**attributes) + def _delete(self): + return self._getset()._delete() + def _update(self, **update_fields): + return self._getset()._update(**update_fields) + def isempty(self): + return self._getset().isempty() + def count(self,distinct=None, cache=None): + return self._getset().count(distinct,cache) + def select(self, *fields, **attributes): + return self._getset().select(*fields,**attributes) + def nested_select(self,*fields,**attributes): + return self._getset().nested_select(*fields,**attributes) + def delete(self): + return self._getset().delete() + def update(self, **update_fields): + return self._getset().update(**update_fields) + def update_naive(self, **update_fields): + return self._getset().update_naive(**update_fields) + def validate_and_update(self, **update_fields): + return self._getset().validate_and_update(**update_fields) + def delete_uploaded_files(self, upload_fields=None): + return self._getset().delete_uploaded_files(upload_fields) class VirtualCommand(object): def __init__(self,method,row): From 4908a5e7be9c2ac72f103d834c56039f9ee500ef Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Sep 2012 23:47:30 -0500 Subject: [PATCH 67/78] reverted DAL singleton until better understood --- VERSION | 2 +- gluon/dal.py | 108 ++++++++++++++++----------------------------------- 2 files changed, 34 insertions(+), 76 deletions(-) diff --git a/VERSION b/VERSION index c956db9c..f8baf1db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 23:38:00) dev +Version 2.0.9 (2012-09-29 23:47:22) dev diff --git a/gluon/dal.py b/gluon/dal.py index bb2f4388..2415785d 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -519,8 +519,6 @@ class ConnectionPool(object): sql_locker.release() if really: getattr(instance, 'close')() - if instance.db._singleton_code in thread_local.db_instances: - del thread_local.db_instances[instance.db._singleton_code] if callable(action): action(None) @@ -1947,7 +1945,7 @@ class BaseAdapter(ConnectionPool): db._referee_name % dict( table=rfield.tablename,field=rfield.name) if referee_link and not referee_link in colset: - colset[referee_link] = LazySet(rfield,id) + colset[referee_link] = Set(db,rfield == id) else: if not '_extra' in new_row: new_row['_extra'] = Row() @@ -6445,6 +6443,15 @@ class Row(object): del d[k] return d +def Row_unpickler(data): + return Row(cPickle.loads(data)) + +def Row_pickler(data): + return Row_unpickler, (cPickle.dumps(data.as_dict(datetime_to_str=False)),) + +copy_reg.pickle(Row, Row_pickler, Row_unpickler) + + ################################################################################ # Everything below should be independent of the specifics of the database # and should work for RDBMs and some NoSQL databases @@ -6576,23 +6583,15 @@ class DAL(object): Field('fieldname2')) """ - def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs): - if not hasattr(thread_local,'db_instances'): - thread_local.db_instances = {} - if 'singleton_code' in kwargs: - singleton_code = kwargs['singleton_code'] - del kwargs['singleton_code'] - else: - singleton_code = hashlib.md5(uri).hexdigest() - try: - db = thread_local.db_instances[singleton_code] - if args or kwargs: - raise RuntimeError, 'Cannot duplicate a Singleton' - except KeyError: - db = super(DAL, cls).__new__(cls, uri, *args, **kwargs) - db._singleton_code = singleton_code - thread_local.db_instances[singleton_code] = db - return db + #def __new__(cls, uri, *args, **kwargs): + # if not hasattr(thread_local,'db_instances'): + # thread_local.db_instances = {} + # try: + # return thread_local.db_instances[uri] + # except KeyError: + # instance = super(DAL, cls).__new__(cls, uri, *args, **kwargs) + # thread_local.db_instances[uri] = instance + # return instance @staticmethod def set_folder(folder): @@ -6674,8 +6673,6 @@ class DAL(object): :attempts (defaults to 5). Number of times to attempt connecting """ - if hasattr(self,'_adapter'): return - if not decode_credentials: credential_decoder = lambda cred: cred else: @@ -7139,8 +7136,6 @@ def index(): adapter = self._adapter if adapter in thread_local.instances: thread_local.instances.remove(adapter) - if self._singleton_code in thread_local.db_instances: - del thread_local.db_instances[self._singleton_code] adapter.close() def executesql(self, query, placeholders=None, as_dict=False, @@ -7270,14 +7265,6 @@ def index(): self[tablename].import_from_csv_file( ifile, id_map, null, unique, id_offset, *args, **kwargs) -def DAL_unpickler(uri): - return DAL(uri) - -def DAL_pickler(db): - return DAL_unpickler, (db._uri,) - -copy_reg.pickle(DAL, DAL_pickler, DAL_unpickler) - class SQLALL(object): """ Helper class providing a comma-separated string having all the field names @@ -8838,12 +8825,10 @@ class Set(object): class RecordUpdater(object): def __init__(self, colset, table, id): - self.colset, self.db, self.tablename, self.id = \ - colset, table._db, table._tablename, id + self.colset, self.table, self.id = colset, table, id def __call__(self, **fields): - colset, db, tablename, id = self.colset, self.db, self.tablename, self.id - table = db[tablename] + colset, table, id = self.colset, self.table, self.id newfields = fields or dict(colset) for fieldname in newfields.keys(): if not fieldname in table.fields or table[fieldname].type=='id': @@ -8854,47 +8839,10 @@ class RecordUpdater(object): class RecordDeleter(object): def __init__(self, table, id): - self.db, self.tablename, self.id = table._db, table._tablename, id + self.table, self.id = table,id def __call__(self): - return self.db(self.db[self.tablename]._id==self.id).delete() + return self.table._db(self.table._id==self.id).delete() -class LazySet(object): - def __init__(self, field, id): - self.db, self.tablename, self.fieldname, self.id = \ - field.db, field._tablename, field.name, id - def _getset(self): - query = self.db[self.tablename][self.fieldname]==self.id - return Set(self.db,query) - def __repr__(self): - return repr(self._getset()) - def __call__(self, query, ignore_common_filters=False): - return self._getset()(query, ignore_common_filters) - def _count(self,distinct=None): - return self._getset()._count(distinct) - def _select(self, *fields, **attributes): - return self._getset()._select(*field,**attributes) - def _delete(self): - return self._getset()._delete() - def _update(self, **update_fields): - return self._getset()._update(**update_fields) - def isempty(self): - return self._getset().isempty() - def count(self,distinct=None, cache=None): - return self._getset().count(distinct,cache) - def select(self, *fields, **attributes): - return self._getset().select(*fields,**attributes) - def nested_select(self,*fields,**attributes): - return self._getset().nested_select(*fields,**attributes) - def delete(self): - return self._getset().delete() - def update(self, **update_fields): - return self._getset().update(**update_fields) - def update_naive(self, **update_fields): - return self._getset().update_naive(**update_fields) - def validate_and_update(self, **update_fields): - return self._getset().validate_and_update(**update_fields) - def delete_uploaded_files(self, upload_fields=None): - return self._getset().delete_uploaded_files(upload_fields) class VirtualCommand(object): def __init__(self,method,row): @@ -9270,6 +9218,16 @@ class Rows(object): import gluon.contrib.simplejson as simplejson return simplejson.dumps(items) +def Rows_unpickler(data): + return cPickle.loads(data) + +def Rows_pickler(data): + return Rows_unpickler, \ + (cPickle.dumps(data.as_list(storage_to_dict=False, + datetime_to_str=False)),) + +copy_reg.pickle(Rows, Rows_pickler, Rows_unpickler) + ################################################################################ # dummy function used to define some doctests From b6f9cd186354cd08079c7c521178f1f158b25be4 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 00:10:25 -0500 Subject: [PATCH 68/78] login works fine with lazy DAL --- VERSION | 2 +- applications/welcome/models/db.py | 2 +- gluon/dal.py | 108 +++++++++++++++++++++--------- gluon/storage.py | 2 +- gluon/tools.py | 2 +- 5 files changed, 79 insertions(+), 37 deletions(-) diff --git a/VERSION b/VERSION index f8baf1db..d9b1716d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-29 23:47:22) dev +Version 2.0.9 (2012-09-30 00:10:18) dev diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py index 26d28122..54a0b231 100644 --- a/applications/welcome/models/db.py +++ b/applications/welcome/models/db.py @@ -11,7 +11,7 @@ if not request.env.web2py_runtime_gae: ## if NOT running on Google App Engine use SQLite or other DB - db = DAL('sqlite://storage.sqlite') + db = DAL('sqlite://storage.sqlite') else: ## connect to Google BigTable (optional 'google:datastore://namespace') db = DAL('google:datastore') diff --git a/gluon/dal.py b/gluon/dal.py index 2415785d..bb2f4388 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -519,6 +519,8 @@ class ConnectionPool(object): sql_locker.release() if really: getattr(instance, 'close')() + if instance.db._singleton_code in thread_local.db_instances: + del thread_local.db_instances[instance.db._singleton_code] if callable(action): action(None) @@ -1945,7 +1947,7 @@ class BaseAdapter(ConnectionPool): db._referee_name % dict( table=rfield.tablename,field=rfield.name) if referee_link and not referee_link in colset: - colset[referee_link] = Set(db,rfield == id) + colset[referee_link] = LazySet(rfield,id) else: if not '_extra' in new_row: new_row['_extra'] = Row() @@ -6443,15 +6445,6 @@ class Row(object): del d[k] return d -def Row_unpickler(data): - return Row(cPickle.loads(data)) - -def Row_pickler(data): - return Row_unpickler, (cPickle.dumps(data.as_dict(datetime_to_str=False)),) - -copy_reg.pickle(Row, Row_pickler, Row_unpickler) - - ################################################################################ # Everything below should be independent of the specifics of the database # and should work for RDBMs and some NoSQL databases @@ -6583,15 +6576,23 @@ class DAL(object): Field('fieldname2')) """ - #def __new__(cls, uri, *args, **kwargs): - # if not hasattr(thread_local,'db_instances'): - # thread_local.db_instances = {} - # try: - # return thread_local.db_instances[uri] - # except KeyError: - # instance = super(DAL, cls).__new__(cls, uri, *args, **kwargs) - # thread_local.db_instances[uri] = instance - # return instance + def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs): + if not hasattr(thread_local,'db_instances'): + thread_local.db_instances = {} + if 'singleton_code' in kwargs: + singleton_code = kwargs['singleton_code'] + del kwargs['singleton_code'] + else: + singleton_code = hashlib.md5(uri).hexdigest() + try: + db = thread_local.db_instances[singleton_code] + if args or kwargs: + raise RuntimeError, 'Cannot duplicate a Singleton' + except KeyError: + db = super(DAL, cls).__new__(cls, uri, *args, **kwargs) + db._singleton_code = singleton_code + thread_local.db_instances[singleton_code] = db + return db @staticmethod def set_folder(folder): @@ -6673,6 +6674,8 @@ class DAL(object): :attempts (defaults to 5). Number of times to attempt connecting """ + if hasattr(self,'_adapter'): return + if not decode_credentials: credential_decoder = lambda cred: cred else: @@ -7136,6 +7139,8 @@ def index(): adapter = self._adapter if adapter in thread_local.instances: thread_local.instances.remove(adapter) + if self._singleton_code in thread_local.db_instances: + del thread_local.db_instances[self._singleton_code] adapter.close() def executesql(self, query, placeholders=None, as_dict=False, @@ -7265,6 +7270,14 @@ def index(): self[tablename].import_from_csv_file( ifile, id_map, null, unique, id_offset, *args, **kwargs) +def DAL_unpickler(uri): + return DAL(uri) + +def DAL_pickler(db): + return DAL_unpickler, (db._uri,) + +copy_reg.pickle(DAL, DAL_pickler, DAL_unpickler) + class SQLALL(object): """ Helper class providing a comma-separated string having all the field names @@ -8825,10 +8838,12 @@ class Set(object): class RecordUpdater(object): def __init__(self, colset, table, id): - self.colset, self.table, self.id = colset, table, id + self.colset, self.db, self.tablename, self.id = \ + colset, table._db, table._tablename, id def __call__(self, **fields): - colset, table, id = self.colset, self.table, self.id + colset, db, tablename, id = self.colset, self.db, self.tablename, self.id + table = db[tablename] newfields = fields or dict(colset) for fieldname in newfields.keys(): if not fieldname in table.fields or table[fieldname].type=='id': @@ -8839,10 +8854,47 @@ class RecordUpdater(object): class RecordDeleter(object): def __init__(self, table, id): - self.table, self.id = table,id + self.db, self.tablename, self.id = table._db, table._tablename, id def __call__(self): - return self.table._db(self.table._id==self.id).delete() + return self.db(self.db[self.tablename]._id==self.id).delete() +class LazySet(object): + def __init__(self, field, id): + self.db, self.tablename, self.fieldname, self.id = \ + field.db, field._tablename, field.name, id + def _getset(self): + query = self.db[self.tablename][self.fieldname]==self.id + return Set(self.db,query) + def __repr__(self): + return repr(self._getset()) + def __call__(self, query, ignore_common_filters=False): + return self._getset()(query, ignore_common_filters) + def _count(self,distinct=None): + return self._getset()._count(distinct) + def _select(self, *fields, **attributes): + return self._getset()._select(*field,**attributes) + def _delete(self): + return self._getset()._delete() + def _update(self, **update_fields): + return self._getset()._update(**update_fields) + def isempty(self): + return self._getset().isempty() + def count(self,distinct=None, cache=None): + return self._getset().count(distinct,cache) + def select(self, *fields, **attributes): + return self._getset().select(*fields,**attributes) + def nested_select(self,*fields,**attributes): + return self._getset().nested_select(*fields,**attributes) + def delete(self): + return self._getset().delete() + def update(self, **update_fields): + return self._getset().update(**update_fields) + def update_naive(self, **update_fields): + return self._getset().update_naive(**update_fields) + def validate_and_update(self, **update_fields): + return self._getset().validate_and_update(**update_fields) + def delete_uploaded_files(self, upload_fields=None): + return self._getset().delete_uploaded_files(upload_fields) class VirtualCommand(object): def __init__(self,method,row): @@ -9218,16 +9270,6 @@ class Rows(object): import gluon.contrib.simplejson as simplejson return simplejson.dumps(items) -def Rows_unpickler(data): - return cPickle.loads(data) - -def Rows_pickler(data): - return Rows_unpickler, \ - (cPickle.dumps(data.as_list(storage_to_dict=False, - datetime_to_str=False)),) - -copy_reg.pickle(Rows, Rows_pickler, Rows_unpickler) - ################################################################################ # dummy function used to define some doctests diff --git a/gluon/storage.py b/gluon/storage.py index 081e7447..72750272 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -46,7 +46,7 @@ class Storage(dict): __repr__ = lambda self: '' % dict.__repr__(self) # http://stackoverflow.com/questions/5247250/why-does-pickle-getstate-accept-as-a-return-value-the-very-instance-it-requi __getstate__ = lambda self: None - __reduce_ex__ = None + # __reduce_ex__ = None def getlist(self,key): """ diff --git a/gluon/tools.py b/gluon/tools.py index d783e6d7..c465b83c 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1709,7 +1709,7 @@ class Auth(object): """ login the user = db.auth_user(id) """ - # user=Storage(self.table_user()._filter_fields(user,id=True)) + user = Storage(self.table_user()._filter_fields(user,id=True)) current.session.auth = Storage( user = user, last_visit = current.request.now, From 65fe4c16fcc4fda856127d626de9084985959178 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 00:23:15 -0500 Subject: [PATCH 69/78] fixed problem with order of lazyness in DAL serialization in session --- VERSION | 2 +- gluon/dal.py | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index d9b1716d..254863b0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 00:10:18) dev +Version 2.0.9 (2012-09-30 00:23:07) dev diff --git a/gluon/dal.py b/gluon/dal.py index bb2f4388..88599ac9 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5067,7 +5067,7 @@ class MongoDBAdapter(NoSQLAdapter): mongoqry_dict, mongofields_dict, skip=limitby_skip, limit=limitby_limit, sort=mongosort_list, snapshot=snapshot) # pymongo cursor object - print "mongo_list_dicts=%s" % mongo_list_dicts + # DEBUG: print "mongo_list_dicts=%s" % mongo_list_dicts rows = [] ### populate row in proper order colnames = [field.name for field in fields] @@ -5191,7 +5191,6 @@ class MongoDBAdapter(NoSQLAdapter): return result def NE(self, first, second=None): - print "in NE" result = {} result[self.expand(first)] = {'$ne': self.expand(second)} return result @@ -5199,7 +5198,6 @@ class MongoDBAdapter(NoSQLAdapter): def LT(self,first,second=None): if second is None: raise RuntimeError, "Cannot compare %s < None" % first - print "in LT" result = {} result[self.expand(first)] = {'$lt': self.expand(second)} return result @@ -5207,13 +5205,11 @@ class MongoDBAdapter(NoSQLAdapter): def LE(self,first,second=None): if second is None: raise RuntimeError, "Cannot compare %s <= None" % first - print "in LE" result = {} result[self.expand(first)] = {'$lte': self.expand(second)} return result def GT(self,first,second): - print "in GT" result = {} result[self.expand(first)] = {'$gt': self.expand(second)} return result @@ -5221,7 +5217,6 @@ class MongoDBAdapter(NoSQLAdapter): def GE(self,first,second=None): if second is None: raise RuntimeError, "Cannot compare %s >= None" % first - print "in GE" result = {} result[self.expand(first)] = {'$gte': self.expand(second)} return result @@ -6674,7 +6669,7 @@ class DAL(object): :attempts (defaults to 5). Number of times to attempt connecting """ - if hasattr(self,'_adapter'): return + if hasattr(self,'_adapter') or uri=='': return if not decode_credentials: credential_decoder = lambda cred: cred @@ -7270,11 +7265,11 @@ def index(): self[tablename].import_from_csv_file( ifile, id_map, null, unique, id_offset, *args, **kwargs) -def DAL_unpickler(uri): - return DAL(uri) +def DAL_unpickler(singleton_code): + return DAL('',singleton_code=singleton_code) def DAL_pickler(db): - return DAL_unpickler, (db._uri,) + return DAL_unpickler, (db._singleton_code,) copy_reg.pickle(DAL, DAL_pickler, DAL_unpickler) From 67022578e362af1d7c6e5995c612b495867e14e8 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 07:26:23 -0500 Subject: [PATCH 70/78] fixed some bugs with singleton and remobed password from session.auth.user --- VERSION | 2 +- gluon/dal.py | 8 ++++---- gluon/globals.py | 8 ++++---- gluon/tools.py | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 254863b0..5f367555 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 00:23:07) dev +Version 2.0.9 (2012-09-30 07:26:14) dev diff --git a/gluon/dal.py b/gluon/dal.py index 88599ac9..ef9df5c3 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -6577,16 +6577,15 @@ class DAL(object): if 'singleton_code' in kwargs: singleton_code = kwargs['singleton_code'] del kwargs['singleton_code'] - else: - singleton_code = hashlib.md5(uri).hexdigest() + singleton_code = hashlib.md5(uri).hexdigest() try: db = thread_local.db_instances[singleton_code] if args or kwargs: raise RuntimeError, 'Cannot duplicate a Singleton' except KeyError: db = super(DAL, cls).__new__(cls, uri, *args, **kwargs) - db._singleton_code = singleton_code thread_local.db_instances[singleton_code] = db + db._singleton_code = singleton_code return db @staticmethod @@ -6641,7 +6640,8 @@ class DAL(object): migrate_enabled=True, fake_migrate_all=False, decode_credentials=False, driver_args=None, adapter_args=None, attempts=5, auto_import=False, - bigint_id=False,debug=False,lazy_tables=False): + bigint_id=False,debug=False,lazy_tables=False, + singleton_code=None): """ Creates a new Database Abstraction Layer instance. diff --git a/gluon/globals.py b/gluon/globals.py index 5dc5818c..f82a6518 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -419,11 +419,11 @@ class Response(Storage): BUTTON = TAG.button admin = URL("admin","default","design", args=current.request.application) - from gluon.dal import thread - if hasattr(thread,'instances'): + from gluon.dal import thread_local + if hasattr(thread_local,'instances'): dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \ for row in i.db._timings]) \ - for i in thread.instances] + for i in thread_local.instances] dbtables = dict([(regex_nopasswd.sub('******',i.uri), {'defined': sorted(list(set(i.db.tables) - @@ -431,7 +431,7 @@ class Response(Storage): '[no defined tables]', 'lazy': sorted(i.db._LAZY_TABLES.keys()) or '[no lazy tables]'}) - for i in thread.instances]) + for i in thread_local.instances]) else: dbstats = [] # if no db or on GAE dbtables = {} diff --git a/gluon/tools.py b/gluon/tools.py index c465b83c..3d4141c1 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1710,6 +1710,7 @@ class Auth(object): login the user = db.auth_user(id) """ user = Storage(self.table_user()._filter_fields(user,id=True)) + if 'password' in user: del user.password current.session.auth = Storage( user = user, last_visit = current.request.now, From 672af73e965b2530ccc7a10a312a00290abeb210 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 07:30:08 -0500 Subject: [PATCH 71/78] fixed admin and new dal --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 5f367555..ef04d69a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 07:26:14) dev +Version 2.0.9 (2012-09-30 07:30:01) dev diff --git a/gluon/dal.py b/gluon/dal.py index ef9df5c3..e46a0fc0 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -6577,7 +6577,7 @@ class DAL(object): if 'singleton_code' in kwargs: singleton_code = kwargs['singleton_code'] del kwargs['singleton_code'] - singleton_code = hashlib.md5(uri).hexdigest() + singleton_code = hashlib.md5(repr(uri)).hexdigest() try: db = thread_local.db_instances[singleton_code] if args or kwargs: From 9ce1cde6caa23e24565beeec49f7b9a10f1833fb Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 08:32:03 -0500 Subject: [PATCH 72/78] fixed issues with grid form and b.parent --- VERSION | 2 +- gluon/globals.py | 8 ++++---- gluon/sqlhtml.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index ef04d69a..b55d9ad4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 07:30:01) dev +Version 2.0.9 (2012-09-30 08:31:56) dev diff --git a/gluon/globals.py b/gluon/globals.py index f82a6518..c40918fb 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -419,11 +419,11 @@ class Response(Storage): BUTTON = TAG.button admin = URL("admin","default","design", args=current.request.application) - from gluon.dal import thread_local - if hasattr(thread_local,'instances'): + from gluon.dal import THREAD_LOCAL + if hasattr(THREAD_LOCAL,'instances'): dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \ for row in i.db._timings]) \ - for i in thread_local.instances] + for i in THREAD_LOCAL.instances] dbtables = dict([(regex_nopasswd.sub('******',i.uri), {'defined': sorted(list(set(i.db.tables) - @@ -431,7 +431,7 @@ class Response(Storage): '[no defined tables]', 'lazy': sorted(i.db._LAZY_TABLES.keys()) or '[no lazy tables]'}) - for i in thread_local.instances]) + for i in THREAD_LOCAL.instances]) else: dbstats = [] # if no db or on GAE dbtables = {} diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 2868f462..47b3c823 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1150,7 +1150,7 @@ class SQLFORM(FORM): else: table = formstyle(self, xfields) for id,a,b,c in xfields: - self.field_parent[id] = b.parent + self.field_parent[id] = getattr(b,'parent',None) else: raise RuntimeError, 'formstyle not supported' return table From 7ec3fe3bfe9cc6c85b9b2fa1b4532426acaa11ef Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 08:37:27 -0500 Subject: [PATCH 73/78] experimental DAL rewrite (work in progress) --- VERSION | 2 +- gluon/dal.py | 172 +++++++++++++++++++++++++-------------------------- 2 files changed, 85 insertions(+), 89 deletions(-) diff --git a/VERSION b/VERSION index b55d9ad4..82e36f39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 08:31:56) dev +Version 2.0.9 (2012-09-30 08:37:19) dev diff --git a/gluon/dal.py b/gluon/dal.py index e46a0fc0..39137bc0 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -218,11 +218,11 @@ try: except ImportError: have_validators = False -logger = logging.getLogger("web2py.dal") +LOGGER = logging.getLogger("web2py.dal") DEFAULT = lambda:0 -sql_locker = threading.RLock() -thread_local = threading.local() +GLOBAL_LOCKER = threading.RLock() +THREAD_LOCAL = threading.local() # internal representation of tables with field #
., tables and fields may only be [a-zA-Z0-9_] @@ -263,13 +263,13 @@ if not 'google' in DRIVERS: from pysqlite2 import dbapi2 as sqlite2 DRIVERS.append('SQLite(sqlite2)') except ImportError: - logger.debug('no SQLite drivers pysqlite2.dbapi2') + LOGGER.debug('no SQLite drivers pysqlite2.dbapi2') try: from sqlite3 import dbapi2 as sqlite3 DRIVERS.append('SQLite(sqlite3)') except ImportError: - logger.debug('no SQLite drivers sqlite3') + LOGGER.debug('no SQLite drivers sqlite3') try: # first try contrib driver, then from site-packages (if installed) @@ -284,13 +284,13 @@ if not 'google' in DRIVERS: import pymysql DRIVERS.append('MySQL(pymysql)') except ImportError: - logger.debug('no MySQL driver pymysql') + LOGGER.debug('no MySQL driver pymysql') try: import MySQLdb DRIVERS.append('MySQL(MySQLdb)') except ImportError: - logger.debug('no MySQL driver MySQLDB') + LOGGER.debug('no MySQL driver MySQLDB') try: @@ -298,7 +298,7 @@ if not 'google' in DRIVERS: from psycopg2.extensions import adapt as psycopg2_adapt DRIVERS.append('PostgreSQL(psycopg2)') except ImportError: - logger.debug('no PostgreSQL driver psycopg2') + LOGGER.debug('no PostgreSQL driver psycopg2') try: # first try contrib driver, then from site-packages (if installed) @@ -308,13 +308,13 @@ if not 'google' in DRIVERS: import pg8000.dbapi as pg8000 DRIVERS.append('PostgreSQL(pg8000)') except ImportError: - logger.debug('no PostgreSQL driver pg8000') + LOGGER.debug('no PostgreSQL driver pg8000') try: import cx_Oracle DRIVERS.append('Oracle(cx_Oracle)') except ImportError: - logger.debug('no Oracle driver cx_Oracle') + LOGGER.debug('no Oracle driver cx_Oracle') try: import pyodbc @@ -322,53 +322,53 @@ if not 'google' in DRIVERS: DRIVERS.append('DB2(pyodbc)') DRIVERS.append('Teradata(pyodbc)') except ImportError: - logger.debug('no MSSQL/DB2/Teradata driver pyodbc') + LOGGER.debug('no MSSQL/DB2/Teradata driver pyodbc') try: import Sybase DRIVERS.append('Sybase(Sybase)') except ImportError: - logger.debug('no Sybase driver') + LOGGER.debug('no Sybase driver') try: import kinterbasdb DRIVERS.append('Interbase(kinterbasdb)') DRIVERS.append('Firebird(kinterbasdb)') except ImportError: - logger.debug('no Firebird/Interbase driver kinterbasdb') + LOGGER.debug('no Firebird/Interbase driver kinterbasdb') try: import fdb DRIVERS.append('Firbird(fdb)') except ImportError: - logger.debug('no Firebird driver fdb') + LOGGER.debug('no Firebird driver fdb') ##### try: import firebirdsql DRIVERS.append('Firebird(firebirdsql)') except ImportError: - logger.debug('no Firebird driver firebirdsql') + LOGGER.debug('no Firebird driver firebirdsql') try: import informixdb DRIVERS.append('Informix(informixdb)') - logger.warning('Informix support is experimental') + LOGGER.warning('Informix support is experimental') except ImportError: - logger.debug('no Informix driver informixdb') + LOGGER.debug('no Informix driver informixdb') try: import sapdb DRIVERS.append('SQL(sapdb)') - logger.warning('SAPDB support is experimental') + LOGGER.warning('SAPDB support is experimental') except ImportError: - logger.debug('no SAP driver sapdb') + LOGGER.debug('no SAP driver sapdb') try: import cubriddb DRIVERS.append('Cubrid(cubriddb)') - logger.warning('Cubrid support is experimental') + LOGGER.warning('Cubrid support is experimental') except ImportError: - logger.debug('no Cubrid driver cubriddb') + LOGGER.debug('no Cubrid driver cubriddb') try: from com.ziclix.python.sql import zxJDBC @@ -378,36 +378,36 @@ if not 'google' in DRIVERS: zxJDBC_sqlite = java.sql.DriverManager DRIVERS.append('PostgreSQL(zxJDBC)') DRIVERS.append('SQLite(zxJDBC)') - logger.warning('zxJDBC support is experimental') + LOGGER.warning('zxJDBC support is experimental') is_jdbc = True except ImportError: - logger.debug('no SQLite/PostgreSQL driver zxJDBC') + LOGGER.debug('no SQLite/PostgreSQL driver zxJDBC') is_jdbc = False try: import ingresdbi DRIVERS.append('Ingres(ingresdbi)') except ImportError: - logger.debug('no Ingres driver ingresdbi') + LOGGER.debug('no Ingres driver ingresdbi') # NOTE could try JDBC....... try: import couchdb DRIVERS.append('CouchDB(couchdb)') except ImportError: - logger.debug('no Couchdb driver couchdb') + LOGGER.debug('no Couchdb driver couchdb') try: import pymongo DRIVERS.append('MongoDB(pymongo)') except: - logger.debug('no MongoDB driver pymongo') + LOGGER.debug('no MongoDB driver pymongo') try: import imaplib DRIVERS.append('IMAP(imaplib)') except: - logger.debug('no IMAP driver imaplib') + LOGGER.debug('no IMAP driver imaplib') PLURALIZE_RULES = [ (re.compile('child$'), re.compile('child$'), 'children'), @@ -493,42 +493,48 @@ class ConnectionPool(object): @staticmethod def set_folder(folder): - thread_local.folder = folder + THREAD_LOCAL.folder = folder # ## this allows gluon to commit/rollback all dbs in this thread + @staticmethod + def recycle_connection(adapter,action): + if action: + if callable(action): + action(adapter) + else: + getattr(adapter, action)() + # ## if you want pools, recycle this connection + really = True + if adapter.pool_size: + GLOBAL_LOCKER.acquire() + pool = ConnectionPool.pools[adapter.uri] + if len(pool) < adapter.pool_size: + pool.append(adapter.connection) + really = False + GLOBAL_LOCKER.release() + if really: + getattr(adapter, 'close')() + @staticmethod def close_all_instances(action): """ to close cleanly databases in a multithreaded environment """ - if hasattr(thread_local, 'instances'): - while thread_local.instances: - instance = thread_local.instances.pop() - if action: - if callable(action): - action(instance) - else: - getattr(instance, action)() - # ## if you want pools, recycle this connection - really = True - if instance.pool_size: - sql_locker.acquire() - pool = ConnectionPool.pools[instance.uri] - if len(pool) < instance.pool_size: - pool.append(instance.connection) - really = False - sql_locker.release() - if really: - getattr(instance, 'close')() - if instance.db._singleton_code in thread_local.db_instances: - del thread_local.db_instances[instance.db._singleton_code] - + dbs = getattr(THREAD_LOCAL,'db_instances',{}).items() + for singleton_code, db in dbs: + try: + adapter = db._adapter + except AttributeError: + pass + else: + ConnectionPool.recycle_connection(adapter,action) + del THREAD_LOCAL.db_instances[singleton_code] if callable(action): action(None) return def find_or_make_work_folder(self): """ this actually does not make the folder. it has to be there """ - self.folder = getattr(thread_local,'folder','') + self.folder = getattr(THREAD_LOCAL,'folder','') # Creating the folder if it does not exist if False and self.folder and not exists(self.folder): @@ -540,7 +546,7 @@ class ConnectionPool(object): def reconnect(self): """ allows a thread to re-connect to server or re-pool """ - self.close_all_instances(False) + ConnectionPool.recycle_connection(self,False) ### WHY? self.pool_connection(self._connection_function) self.after_connection() @@ -560,12 +566,12 @@ class ConnectionPool(object): else: uri = self.uri while True: - sql_locker.acquire() + GLOBAL_LOCKER.acquire() if not uri in pools: pools[uri] = [] if pools[uri]: self.connection = pools[uri].pop() - sql_locker.release() + GLOBAL_LOCKER.release() self.cursor = cursor and self.connection.cursor() try: if self.cursor and self.check_active_connection: @@ -574,14 +580,10 @@ class ConnectionPool(object): except: pass else: - sql_locker.release() + GLOBAL_LOCKER.release() self.connection = f() self.cursor = cursor and self.connection.cursor() break - if not hasattr(thread_local,'instances'): - thread_local.instances = [] - thread_local.instances.append(self) - ################################################################################### # this is a generic adapter that does nothing; all others are derived from this one @@ -1663,7 +1665,7 @@ class BaseAdapter(ConnectionPool): def log_execute(self, *a, **b): command = a[0] if self.db._debug: - logger.debug('SQL: %s' % command) + LOGGER.debug('SQL: %s' % command) self.db._lastsql = command t0 = time.time() ret = self.cursor.execute(*a, **b) @@ -2983,7 +2985,7 @@ class MSSQLAdapter(BaseAdapter): if not dsn: raise SyntaxError, 'DSN required' except SyntaxError, e: - logger.error('NdGpatch error') + LOGGER.error('NdGpatch error') raise e # was cnxn = 'DSN=%s' % dsn cnxn = dsn @@ -3181,7 +3183,7 @@ class SybaseAdapter(MSSQLAdapter): if not dsn: raise SyntaxError, 'DSN required' except SyntaxError, e: - logger.error('NdGpatch error') + LOGGER.error('NdGpatch error') raise e else: m = self.REGEX_URI.match(uri) @@ -4015,7 +4017,7 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): self.uri = uri self.pool_size = pool_size self.db_codec = db_codec - self.folder = folder or pjoin('$HOME',thread_local.folder.split( + self.folder = folder or pjoin('$HOME',THREAD_LOCAL.folder.split( os.sep+'applications'+os.sep,1)[1]) ruri = uri.split("://")[1] m = self.REGEX_URI.match(ruri) @@ -4585,7 +4587,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter): setattr(item, field.name, self.represent(value,field.type)) item.put() counter += 1 - logger.info(str(counter)) + LOGGER.info(str(counter)) return counter def insert(self,table,fields): @@ -5531,12 +5533,12 @@ class IMAPAdapter(NoSQLAdapter): else: uri = self.uri while True: - sql_locker.acquire() + GLOBAL_LOCKER.acquire() if not uri in pools: pools[uri] = [] if pools[uri]: self.connection = pools[uri].pop() - sql_locker.release() + GLOBAL_LOCKER.release() self.cursor = cursor and self.connection.cursor() if self.cursor and self.check_active_connection: try: @@ -5548,15 +5550,11 @@ class IMAPAdapter(NoSQLAdapter): self.connection = f() break else: - sql_locker.release() + GLOBAL_LOCKER.release() self.connection = f() self.cursor = cursor and self.connection.cursor() break - if not hasattr(thread_local,'instances'): - thread_local.instances = [] - thread_local.instances.append(self) - def get_last_message(self, tablename): last_message = None # request mailbox list to the server @@ -5567,7 +5565,7 @@ class IMAPAdapter(NoSQLAdapter): result = self.connection.select(self.connection.mailbox_names[tablename]) last_message = int(result[1][0]) except (IndexError, ValueError, TypeError, KeyError), e: - logger.debug("Error retrieving the last mailbox sequence number. %s" % str(e)) + LOGGER.debug("Error retrieving the last mailbox sequence number. %s" % str(e)) return last_message def get_uid_bounds(self, tablename): @@ -5599,7 +5597,7 @@ class IMAPAdapter(NoSQLAdapter): try: dayname, datestring = date.split(",") except (ValueError): - logger.debug("Could not parse date text: %s" % date) + LOGGER.debug("Could not parse date text: %s" % date) return None date_list = datestring.strip().split() year = int(date_list[2]) @@ -5729,7 +5727,7 @@ class IMAPAdapter(NoSQLAdapter): def create_table(self, *args, **kwargs): # not implemented - logger.debug("Create table feature is not implemented for %s" % type(self)) + LOGGER.debug("Create table feature is not implemented for %s" % type(self)) def _select(self,query,fields,attributes): """ Search and Fetch records and return web2py @@ -6057,7 +6055,7 @@ class IMAPAdapter(NoSQLAdapter): try: pedestal, threshold = self.get_uid_bounds(first.tablename) except TypeError, e: - logger.debug("Error requesting uid bounds: %s", str(e)) + LOGGER.debug("Error requesting uid bounds: %s", str(e)) return "" try: lower_limit = int(self.expand(second)) + 1 @@ -6085,7 +6083,7 @@ class IMAPAdapter(NoSQLAdapter): try: pedestal, threshold = self.get_uid_bounds(first.tablename) except TypeError, e: - logger.debug("Error requesting uid bounds: %s", str(e)) + LOGGER.debug("Error requesting uid bounds: %s", str(e)) return "" lower_limit = self.expand(second) result = "UID %s:%s" % (lower_limit, threshold) @@ -6104,7 +6102,7 @@ class IMAPAdapter(NoSQLAdapter): try: pedestal, threshold = self.get_uid_bounds(first.tablename) except TypeError, e: - logger.debug("Error requesting uid bounds: %s", str(e)) + LOGGER.debug("Error requesting uid bounds: %s", str(e)) return "" try: upper_limit = int(self.expand(second)) - 1 @@ -6128,7 +6126,7 @@ class IMAPAdapter(NoSQLAdapter): try: pedestal, threshold = self.get_uid_bounds(first.tablename) except TypeError, e: - logger.debug("Error requesting uid bounds: %s", str(e)) + LOGGER.debug("Error requesting uid bounds: %s", str(e)) return "" upper_limit = int(self.expand(second)) result = "UID %s:%s" % (pedestal, upper_limit) @@ -6572,19 +6570,19 @@ class DAL(object): """ def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs): - if not hasattr(thread_local,'db_instances'): - thread_local.db_instances = {} + if not hasattr(THREAD_LOCAL,'db_instances'): + THREAD_LOCAL.db_instances = {} if 'singleton_code' in kwargs: singleton_code = kwargs['singleton_code'] del kwargs['singleton_code'] singleton_code = hashlib.md5(repr(uri)).hexdigest() try: - db = thread_local.db_instances[singleton_code] + db = THREAD_LOCAL.db_instances[singleton_code] if args or kwargs: raise RuntimeError, 'Cannot duplicate a Singleton' except KeyError: db = super(DAL, cls).__new__(cls, uri, *args, **kwargs) - thread_local.db_instances[singleton_code] = db + THREAD_LOCAL.db_instances[singleton_code] = db db._singleton_code = singleton_code return db @@ -7062,12 +7060,12 @@ def index(): args_get('fake_migrate',self._fake_migrate) polymodel = args_get('polymodel',None) try: - sql_locker.acquire() + GLOBAL_LOCKER.acquire() self._adapter.create_table(table,migrate=migrate, fake_migrate=fake_migrate, polymodel=polymodel) finally: - sql_locker.release() + GLOBAL_LOCKER.release() else: table._dbt = None on_define = args_get('on_define',None) @@ -7132,10 +7130,8 @@ def index(): def close(self): adapter = self._adapter - if adapter in thread_local.instances: - thread_local.instances.remove(adapter) - if self._singleton_code in thread_local.db_instances: - del thread_local.db_instances[self._singleton_code] + if self._singleton_code in THREAD_LOCAL.db_instances: + del THREAD_LOCAL.db_instances[self._singleton_code] adapter.close() def executesql(self, query, placeholders=None, as_dict=False, From 954c79abcb2a07400d6888eeb08d04cbe299724f Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 13:20:05 -0500 Subject: [PATCH 74/78] fixed Storage copy --- VERSION | 2 +- gluon/dal.py | 73 +++++++++++++++++++++++------------------------- gluon/storage.py | 3 +- 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/VERSION b/VERSION index 82e36f39..67943ce0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 08:37:19) dev +Version 2.0.9 (2012-09-30 13:19:56) dev diff --git a/gluon/dal.py b/gluon/dal.py index 39137bc0..80da46c4 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -488,7 +488,7 @@ if 'google' in DRIVERS: class ConnectionPool(object): - pools = {} + POOLS = {} check_active_connection = True @staticmethod @@ -497,36 +497,31 @@ class ConnectionPool(object): # ## this allows gluon to commit/rollback all dbs in this thread - @staticmethod - def recycle_connection(adapter,action): + def close(self,action='commit',really=True): if action: if callable(action): - action(adapter) + action(self) else: - getattr(adapter, action)() + getattr(self, action)() # ## if you want pools, recycle this connection - really = True - if adapter.pool_size: + if self.pool_size: GLOBAL_LOCKER.acquire() - pool = ConnectionPool.pools[adapter.uri] - if len(pool) < adapter.pool_size: - pool.append(adapter.connection) + pool = ConnectionPool.POOLS[self.uri] + if len(pool) < self.pool_size: + pool.append(self.connection) really = False GLOBAL_LOCKER.release() if really: - getattr(adapter, 'close')() + self.close_connection() + self.connection = None @staticmethod def close_all_instances(action): """ to close cleanly databases in a multithreaded environment """ dbs = getattr(THREAD_LOCAL,'db_instances',{}).items() for singleton_code, db in dbs: - try: - adapter = db._adapter - except AttributeError: - pass - else: - ConnectionPool.recycle_connection(adapter,action) + if hasattr(db,'_adapter'): + db._adapter.close(action) del THREAD_LOCAL.db_instances[singleton_code] if callable(action): action(None) @@ -544,13 +539,7 @@ class ConnectionPool(object): """ this it is suppoed to be overloaded by adtapters""" pass - def reconnect(self): - """ allows a thread to re-connect to server or re-pool """ - ConnectionPool.recycle_connection(self,False) ### WHY? - self.pool_connection(self._connection_function) - self.after_connection() - - def pool_connection(self, f, cursor=True): + def pool_connection(self, f=None, cursor=True): """ this function defines: self.connection and self.cursor (iff cursor is True) @@ -558,19 +547,25 @@ class ConnectionPool(object): if the connection is not active (closed by db server) it will loop if not self.pool_size or no active connections in pool makes a new one """ - pools = ConnectionPool.pools - self._connection_function = f + if getattr(self,'connection',None) != None: + return + if not f is None: + self._connection_function = f + else: + f = self._connection_function + if not self.pool_size: self.connection = f() self.cursor = cursor and self.connection.cursor() else: uri = self.uri + POOLS = ConnectionPool.POOLS while True: GLOBAL_LOCKER.acquire() - if not uri in pools: - pools[uri] = [] - if pools[uri]: - self.connection = pools[uri].pop() + if not uri in POOLS: + POOLS[uri] = [] + if POOLS[uri]: + self.connection = POOLS[uri].pop() GLOBAL_LOCKER.release() self.cursor = cursor and self.connection.cursor() try: @@ -584,6 +579,8 @@ class ConnectionPool(object): self.connection = f() self.cursor = cursor and self.connection.cursor() break + self.after_connection() + ################################################################################### # this is a generic adapter that does nothing; all others are derived from this one @@ -1638,7 +1635,7 @@ class BaseAdapter(ConnectionPool): def rollback(self): return self.connection.rollback() - def close(self): + def close_connection(self): return self.connection.close() def distributed_transaction_begin(self, key): @@ -3968,7 +3965,7 @@ class DatabaseStoredFile: def write(self,data): self.data += data - def close(self): + def close_connection(self): self.db.executesql("DELETE FROM web2py_filesystem WHERE path='%s'" \ % self.filename) query = "INSERT INTO web2py_filesystem(path,content) VALUES ('%s','%s')"\ @@ -4154,7 +4151,7 @@ class NoSQLAdapter(BaseAdapter): """ pass - def close(self): + def close_connection(self): """ remember: no transactions on many NoSQL """ @@ -5526,7 +5523,7 @@ class IMAPAdapter(NoSQLAdapter): closing """ - pools = ConnectionPool.pools + POOLS = ConnectionPool.POOLS if not self.pool_size: self.connection = f() self.cursor = cursor and self.connection.cursor() @@ -5534,10 +5531,10 @@ class IMAPAdapter(NoSQLAdapter): uri = self.uri while True: GLOBAL_LOCKER.acquire() - if not uri in pools: - pools[uri] = [] - if pools[uri]: - self.connection = pools[uri].pop() + if not uri in POOLS: + POOLS[uri] = [] + if POOLS[uri]: + self.connection = POOLS[uri].pop() GLOBAL_LOCKER.release() self.cursor = cursor and self.connection.cursor() if self.cursor and self.check_active_connection: diff --git a/gluon/storage.py b/gluon/storage.py index 72750272..4a1900d5 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -46,7 +46,8 @@ class Storage(dict): __repr__ = lambda self: '' % dict.__repr__(self) # http://stackoverflow.com/questions/5247250/why-does-pickle-getstate-accept-as-a-return-value-the-very-instance-it-requi __getstate__ = lambda self: None - # __reduce_ex__ = None + __copy__ = lambda self: Storage(self) + def getlist(self,key): """ From 5148c6ec3a20edc030687a8c6626083ab77c21ee Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 13:40:41 -0500 Subject: [PATCH 75/78] cleaner code in dal --- VERSION | 2 +- gluon/contrib/pyuca/LICENSE | 19 +++++ gluon/contrib/pyuca/README.markmin | 43 ++++++++++ gluon/dal.py | 124 +++++++++++++---------------- 4 files changed, 117 insertions(+), 71 deletions(-) create mode 100644 gluon/contrib/pyuca/LICENSE create mode 100644 gluon/contrib/pyuca/README.markmin diff --git a/VERSION b/VERSION index 67943ce0..680ac6b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 13:19:56) dev +Version 2.0.9 (2012-09-30 13:40:33) dev diff --git a/gluon/contrib/pyuca/LICENSE b/gluon/contrib/pyuca/LICENSE new file mode 100644 index 00000000..a52383bb --- /dev/null +++ b/gluon/contrib/pyuca/LICENSE @@ -0,0 +1,19 @@ +# Copyright (c) 2006-2012 James Tauber and contributors +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. \ No newline at end of file diff --git a/gluon/contrib/pyuca/README.markmin b/gluon/contrib/pyuca/README.markmin new file mode 100644 index 00000000..c146ccf5 --- /dev/null +++ b/gluon/contrib/pyuca/README.markmin @@ -0,0 +1,43 @@ +# pyuca: Python Unicode Collation Algorithm implementation +(http://jtauber.com/blog/2006/01/27/python_unicode_collation_algorithm/) + +This is my preliminary attempt at a Python implementation of the +[Unicode Collation Algorithm (UCA)](http://unicode.org/reports/tr10/). +I originally posted it to my blog in 2006 but it seems to get enough +usage it really belongs here (and in PyPI). + +What do you use it for? In short, sorting non-English strings properly. + +The core of the algorithm involves multi-level comparison. For example, +``café`` comes before ``caff`` because at the primary level, the accent +is ignored and the first word is treated as if it were ``cafe``. +The secondary level (which considers accents) only applies then to words +that are equivalent at the primary level. + +The Unicode Collation Algorithm and pyuca also support contraction and +expansion. **Contraction** is where multiple letters are treated as a +single unit. In Spanish, ``ch`` is treated as a letter coming between +``c`` and ``d`` so that, for example, words beginning ``ch`` should +sort after all other words beginnings with ``c``. **Expansion** is where +a single letter is treated as though it were multiple letters. In German, +``ä`` is sorted as if it were ``ae``, i.e. after ``ad`` but before ``af``. + +## Here is how to use the ``pyuca`` module: +`` +git clone https://github.com/jtauber/pyuca.git +cd pyuca +pip install pyuca +`` + +**Usage example:** +`` + from pyuca import Collator + c = Collator("allkeys.txt") + + sorted_words = sorted(words, key=c.sort_key) +`` + +``allkeys.txt`` (1 MB) is available at + +http://www.unicode.org/Public/UCA/latest/allkeys.txt + diff --git a/gluon/dal.py b/gluon/dal.py index 80da46c4..545a9245 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -539,7 +539,7 @@ class ConnectionPool(object): """ this it is suppoed to be overloaded by adtapters""" pass - def pool_connection(self, f=None, cursor=True): + def reconnect(self, f=None, cursor=True): """ this function defines: self.connection and self.cursor (iff cursor is True) @@ -579,7 +579,7 @@ class ConnectionPool(object): self.connection = f() self.cursor = cursor and self.connection.cursor() break - self.after_connection() + self.after_connection() ################################################################################### @@ -2074,10 +2074,9 @@ class SQLiteAdapter(BaseAdapter): driver_args['check_same_thread'] = False if not 'detect_types' in driver_args: driver_args['detect_types'] = self.driver.PARSE_DECLTYPES - def connect(dbpath=dbpath, driver_args=driver_args): + def connector(dbpath=dbpath, driver_args=driver_args): return self.driver.Connection(dbpath, **driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.connection.create_function('web2py_extract', 2, @@ -2138,10 +2137,9 @@ class SpatiaLiteAdapter(SQLiteAdapter): driver_args['check_same_thread'] = False if not 'detect_types' in driver_args: driver_args['detect_types'] = self.driver.PARSE_DECLTYPES - def connect(dbpath=dbpath, driver_args=driver_args): + def connector(dbpath=dbpath, driver_args=driver_args): return self.driver.Connection(dbpath, **driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.connection.enable_load_extension(True) @@ -2238,12 +2236,11 @@ class JDBCSQLiteAdapter(SQLiteAdapter): if dbpath[0] != '/': dbpath = pjoin( self.folder.decode(path_encoding).encode('utf8'), dbpath) - def connect(dbpath=dbpath,driver_args=driver_args): + def connector(dbpath=dbpath,driver_args=driver_args): return self.driver.connect( self.driver.getConnection('jdbc:sqlite:'+dbpath), **driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): # FIXME http://www.zentus.com/sqlitejdbc/custom_functions.html for UDFs @@ -2358,10 +2355,9 @@ class MySQLAdapter(BaseAdapter): charset=charset) - def connect(driver_args=driver_args): + def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.execute('SET FOREIGN_KEY_CHECKS=1;') @@ -2486,10 +2482,9 @@ class PostgreSQLAdapter(BaseAdapter): % (db, user, host, port, password) # choose diver according uri self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__) - def connect(msg=msg,driver_args=driver_args): + def connector(msg=msg,driver_args=driver_args): return self.driver.connect(msg,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.connection.set_client_encoding('UTF8') @@ -2701,10 +2696,9 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter): raise SyntaxError, 'Database name required' port = m.group('port') or '5432' msg = ('jdbc:postgresql://%s:%s/%s' % (host, port, db), user, password) - def connect(msg=msg,driver_args=driver_args): + def connector(msg=msg,driver_args=driver_args): return self.driver.connect(*msg,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.connection.set_client_encoding('UTF8') @@ -2811,10 +2805,9 @@ class OracleAdapter(BaseAdapter): ruri = uri.split('://',1)[1] if not 'threaded' in driver_args: driver_args['threaded']=True - def connect(uri=ruri,driver_args=driver_args): + def connector(uri=ruri,driver_args=driver_args): return self.driver.connect(uri,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';") @@ -3014,11 +3007,10 @@ class MSSQLAdapter(BaseAdapter): urlargs = ';'.join(['%s=%s' % (ak, av) for (ak, av) in argsdict.iteritems()]) cnxn = 'SERVER=%s;PORT=%s;DATABASE=%s;UID=%s;PWD=%s;%s' \ % (host, port, db, user, password, urlargs) - def connect(cnxn=cnxn,driver_args=driver_args): + def connector(cnxn=cnxn,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) if not fake_connect: - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def lastrowid(self,table): #self.execute('SELECT @@IDENTITY;') @@ -3206,11 +3198,10 @@ class SybaseAdapter(MSSQLAdapter): driver_args.update(user = credential_decoder(user), password = credential_decoder(password)) - def connect(dsn=dsn,driver_args=driver_args): + def connector(dsn=dsn,driver_args=driver_args): return self.driver.connect(dsn,**driver_args) if not fake_connect: - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def integrity_error_class(self): return RuntimeError # FIX THIS @@ -3313,10 +3304,9 @@ class FireBirdAdapter(BaseAdapter): password = credential_decoder(password), charset = charset) - def connect(driver_args=driver_args): + def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def create_sequence_and_triggers(self, query, table, **args): tablename = table._tablename @@ -3373,11 +3363,9 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter): password=credential_decoder(password), charset=charset) - def connect(driver_args=driver_args): + def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.pool_connection(connect) - self.after_connection() - + self.reconnect(connector) class InformixAdapter(BaseAdapter): drivers = ('informixdb',) @@ -3478,10 +3466,9 @@ class InformixAdapter(BaseAdapter): password = credential_decoder(password) dsn = '%s@%s' % (db,host) driver_args.update(user=user,password=password,autocommit=True) - def connect(dsn=dsn,driver_args=driver_args): + def connector(dsn=dsn,driver_args=driver_args): return self.driver.connect(dsn,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def execute(self,command): if command[-1:]==';': @@ -3560,10 +3547,9 @@ class DB2Adapter(BaseAdapter): self.db_codec = db_codec self.find_or_make_work_folder() ruri = uri.split('://', 1)[1] - def connect(cnxn=ruri,driver_args=driver_args): + def connector(cnxn=ruri,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def execute(self,command): if command[-1:]==';': @@ -3623,10 +3609,9 @@ class TeradataAdapter(BaseAdapter): self.db_codec = db_codec self.find_or_make_work_folder() ruri = uri.split('://', 1)[1] - def connect(cnxn=ruri,driver_args=driver_args): + def connector(cnxn=ruri,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def LEFT_JOIN(self): return 'LEFT OUTER JOIN' @@ -3716,10 +3701,9 @@ class IngresAdapter(BaseAdapter): vnode=vnode, servertype=servertype, trace=trace) - def connect(driver_args=driver_args): + def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def create_sequence_and_triggers(self, query, table, **args): # post create table auto inc code (if needed) @@ -3855,12 +3839,11 @@ class SAPDBAdapter(BaseAdapter): db = m.group('db') if not db: raise SyntaxError, 'Database name required' - def connect(user=user, password=password, database=db, + def connector(user=user, password=password, database=db, host=host, driver_args=driver_args): return self.driver.Connection(user, password, database, host, **driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def lastrowid(self,table): self.execute("select %s.NEXTVAL from dual" % table._sequence_name) @@ -3903,11 +3886,10 @@ class CubridAdapter(MySQLAdapter): charset = m.group('charset') or 'utf8' user = credential_decoder(user) passwd = credential_decoder(password) - def connect(host=host,port=port,db=db, + def connector(host=host,port=port,db=db, user=user,passwd=password,driver_args=driver_args): return self.driver.connect(host,port,db,user,passwd,**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): self.execute('SET FOREIGN_KEY_CHECKS=1;') @@ -4026,10 +4008,9 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): self.createdb = createdb = adapter_args.get('createdb',True) if not createdb: driver_args['database'] = db - def connect(driver_args=driver_args): + def connector(driver_args=driver_args): return rdbms.connect(**driver_args) - self.pool_connection(connect) - self.after_connection() + self.reconnect(connector) def after_connection(self): if self.createdb: @@ -4687,10 +4668,9 @@ class CouchDBAdapter(NoSQLAdapter): self.pool_size = pool_size url='http://'+uri[10:] - def connect(url=url,driver_args=driver_args): + def connector(url=url,driver_args=driver_args): return self.driver.Server(url,**driver_args) - self.pool_connection(connect,cursor=False) - self.after_connection() + self.reconnect(connector,cursor=False) def create_table(self, table, migrate=True, fake_migrate=False, polymodel=None): if migrate: @@ -4873,7 +4853,7 @@ class MongoDBAdapter(NoSQLAdapter): m = {"database" : m[1]} if m.get('database')==None: raise SyntaxError("Database is required!") - def connect(uri=self.uri,m=m): + def connector(uri=self.uri,m=m): try: return self.driver.Connection(uri)[m.get('database')] except self.driver.errors.ConnectionFailure, inst: @@ -4883,10 +4863,7 @@ class MongoDBAdapter(NoSQLAdapter): raise SyntaxError("You are probebly running version 1.1 of pymongo which contains a bug which requires authentication. Update your pymongo.") else: raise SyntaxError("This is not an official Mongodb uri (http://www.mongodb.org/display/DOCS/Connections) Error : %s" % inst) - self.pool_connection(connect,cursor=False) - self.after_connection() - - + self.reconnect(connector,cursor=False) def represent(self, obj, fieldtype): value = NoSQLAdapter.represent(self, obj, fieldtype) @@ -5491,7 +5468,7 @@ class IMAPAdapter(NoSQLAdapter): over_ssl = True driver_args.update(host=host,port=port, password=password, user=user) - def connect(driver_args=driver_args): + def connector(driver_args=driver_args): # it is assumed sucessful authentication alLways # TODO: support direct connection and login tests if over_ssl: @@ -5510,10 +5487,9 @@ class IMAPAdapter(NoSQLAdapter): return connection self.db.define_tables = self.define_tables - self.pool_connection(connect) - # self.after_connection() + self.reconnect(connector) - def pool_connection(self, f, cursor=True): + def reconnect(self, f, cursor=True): """ IMAP4 Pool connection method @@ -5523,11 +5499,18 @@ class IMAPAdapter(NoSQLAdapter): closing """ - POOLS = ConnectionPool.POOLS + if getattr(self,'connection',None) != None: + return + if not f is None: + self._connection_function = f + else: + f = self._connection_function + if not self.pool_size: self.connection = f() self.cursor = cursor and self.connection.cursor() else: + POOLS = ConnectionPool.POOLS uri = self.uri while True: GLOBAL_LOCKER.acquire() @@ -5551,6 +5534,7 @@ class IMAPAdapter(NoSQLAdapter): self.connection = f() self.cursor = cursor and self.connection.cursor() break + self.after_connection() def get_last_message(self, tablename): last_message = None From f6652e7530c1265f06f67647d2149cadda819d46 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 13:47:49 -0500 Subject: [PATCH 76/78] made contrib.pbkdf2 optionional for utils --- VERSION | 2 +- gluon/utils.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 680ac6b1..f6d61413 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 13:40:33) dev +Version 2.0.9 (2012-09-30 13:47:42) dev diff --git a/gluon/utils.py b/gluon/utils.py index 94376894..1d1e232c 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -21,7 +21,11 @@ import os import re import logging import socket -from contrib.pbkdf2 import pbkdf2_hex +try: + from contrib.pbkdf2 import pbkdf2_hex + HAVE_PBKDF2 = True +except ImportError: + HAVE_PBKDF2 = False logger = logging.getLogger("web2py") From 6da330a001d1ee7715781f0de3cc605a71141efa Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 14:19:52 -0500 Subject: [PATCH 77/78] adapter have do_connect --- VERSION | 2 +- gluon/dal.py | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/VERSION b/VERSION index f6d61413..f2d89e3a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 13:47:42) dev +Version 2.0.9 (2012-09-30 14:19:41) dev diff --git a/gluon/dal.py b/gluon/dal.py index 545a9245..00965668 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -590,11 +590,13 @@ class BaseAdapter(ConnectionPool): driver = None driver_name = None drivers = () # list of drivers from which to pick + connection = None maxcharlength = MAXCHARLENGTH commit_on_alter_table = False support_distributed_transaction = False uploads_in_blob = False can_select_for_update = True + types = { 'boolean': 'CHAR(1)', 'string': 'CHAR(%(length)s)', @@ -681,7 +683,7 @@ class BaseAdapter(ConnectionPool): def __init__(self, db,uri,pool_size=0, folder=None, db_codec='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={},do_connect=True): self.db = db self.dbengine = "None" self.uri = uri @@ -2052,7 +2054,7 @@ class SQLiteAdapter(BaseAdapter): def __init__(self, db, uri, pool_size=0, folder=None, db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "sqlite" self.uri = uri @@ -2076,7 +2078,7 @@ class SQLiteAdapter(BaseAdapter): driver_args['detect_types'] = self.driver.PARSE_DECLTYPES def connector(dbpath=dbpath, driver_args=driver_args): return self.driver.Connection(dbpath, **driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.connection.create_function('web2py_extract', 2, @@ -2139,7 +2141,7 @@ class SpatiaLiteAdapter(SQLiteAdapter): driver_args['detect_types'] = self.driver.PARSE_DECLTYPES def connector(dbpath=dbpath, driver_args=driver_args): return self.driver.Connection(dbpath, **driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.connection.enable_load_extension(True) @@ -2218,7 +2220,7 @@ class JDBCSQLiteAdapter(SQLiteAdapter): def __init__(self, db, uri, pool_size=0, folder=None, db_codec='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "sqlite" self.uri = uri @@ -2240,7 +2242,7 @@ class JDBCSQLiteAdapter(SQLiteAdapter): return self.driver.connect( self.driver.getConnection('jdbc:sqlite:'+dbpath), **driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): # FIXME http://www.zentus.com/sqlitejdbc/custom_functions.html for UDFs @@ -2319,7 +2321,7 @@ class MySQLAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "mysql" self.uri = uri @@ -2357,7 +2359,7 @@ class MySQLAdapter(BaseAdapter): def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.execute('SET FOREIGN_KEY_CHECKS=1;') @@ -2444,7 +2446,7 @@ class PostgreSQLAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}, srid=4326): + adapter_args={}, do_connect=True, srid=4326): self.db = db self.dbengine = "postgres" self.uri = uri @@ -2484,7 +2486,7 @@ class PostgreSQLAdapter(BaseAdapter): self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__) def connector(msg=msg,driver_args=driver_args): return self.driver.connect(msg,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.connection.set_client_encoding('UTF8') @@ -2669,7 +2671,7 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "postgres" self.uri = uri @@ -2698,7 +2700,7 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter): msg = ('jdbc:postgresql://%s:%s/%s' % (host, port, db), user, password) def connector(msg=msg,driver_args=driver_args): return self.driver.connect(*msg,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.connection.set_client_encoding('UTF8') @@ -2793,7 +2795,7 @@ class OracleAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "oracle" self.uri = uri @@ -2807,7 +2809,7 @@ class OracleAdapter(BaseAdapter): driver_args['threaded']=True def connector(uri=ruri,driver_args=driver_args): return self.driver.connect(uri,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';") @@ -2953,7 +2955,7 @@ class MSSQLAdapter(BaseAdapter): 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): + adapter_args={}, do_connect=True, srid=4326): self.db = db self.dbengine = "mssql" self.uri = uri @@ -3009,8 +3011,7 @@ class MSSQLAdapter(BaseAdapter): % (host, port, db, user, password, urlargs) def connector(cnxn=cnxn,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - if not fake_connect: - self.reconnect(connector) + if do_connect: self.reconnect(connector) def lastrowid(self,table): #self.execute('SELECT @@IDENTITY;') @@ -3150,7 +3151,7 @@ class SybaseAdapter(MSSQLAdapter): 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): + adapter_args={}, do_connect=True, srid=4326): self.db = db self.dbengine = "sybase" self.uri = uri @@ -3200,8 +3201,7 @@ class SybaseAdapter(MSSQLAdapter): def connector(dsn=dsn,driver_args=driver_args): return self.driver.connect(dsn,**driver_args) - if not fake_connect: - self.reconnect(connector) + if do_connect: self.reconnect(connector) def integrity_error_class(self): return RuntimeError # FIX THIS @@ -3272,7 +3272,7 @@ class FireBirdAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "firebird" self.uri = uri @@ -3306,7 +3306,7 @@ class FireBirdAdapter(BaseAdapter): def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def create_sequence_and_triggers(self, query, table, **args): tablename = table._tablename @@ -3330,7 +3330,7 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "firebird" self.uri = uri @@ -3365,7 +3365,7 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter): def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) class InformixAdapter(BaseAdapter): drivers = ('informixdb',) @@ -3436,7 +3436,7 @@ class InformixAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "informix" self.uri = uri @@ -3468,7 +3468,7 @@ class InformixAdapter(BaseAdapter): driver_args.update(user=user,password=password,autocommit=True) def connector(dsn=dsn,driver_args=driver_args): return self.driver.connect(dsn,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def execute(self,command): if command[-1:]==';': @@ -3537,7 +3537,7 @@ class DB2Adapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "db2" self.uri = uri @@ -3549,7 +3549,7 @@ class DB2Adapter(BaseAdapter): ruri = uri.split('://', 1)[1] def connector(cnxn=ruri,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def execute(self,command): if command[-1:]==';': @@ -3599,7 +3599,7 @@ class TeradataAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "teradata" self.uri = uri @@ -3611,7 +3611,7 @@ class TeradataAdapter(BaseAdapter): ruri = uri.split('://', 1)[1] def connector(cnxn=ruri,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def LEFT_JOIN(self): return 'LEFT OUTER JOIN' @@ -3679,7 +3679,7 @@ class IngresAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "ingres" self.uri = uri @@ -3703,7 +3703,7 @@ class IngresAdapter(BaseAdapter): trace=trace) def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def create_sequence_and_triggers(self, query, table, **args): # post create table auto inc code (if needed) @@ -3814,7 +3814,7 @@ class SAPDBAdapter(BaseAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "sapdb" self.uri = uri @@ -3843,7 +3843,7 @@ class SAPDBAdapter(BaseAdapter): host=host, driver_args=driver_args): return self.driver.Connection(user, password, database, host, **driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def lastrowid(self,table): self.execute("select %s.NEXTVAL from dual" % table._sequence_name) @@ -3856,7 +3856,7 @@ class CubridAdapter(MySQLAdapter): def __init__(self, db, uri, pool_size=0, folder=None, db_codec='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "cubrid" self.uri = uri @@ -3889,7 +3889,7 @@ class CubridAdapter(MySQLAdapter): def connector(host=host,port=port,db=db, user=user,passwd=password,driver_args=driver_args): return self.driver.connect(host,port,db,user,passwd,**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): self.execute('SET FOREIGN_KEY_CHECKS=1;') @@ -3989,7 +3989,7 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): def __init__(self, db, uri='google:sql://realm:domain/database', pool_size=0, folder=None, db_codec='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.dbengine = "mysql" @@ -4010,7 +4010,7 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): driver_args['database'] = db def connector(driver_args=driver_args): return rdbms.connect(**driver_args) - self.reconnect(connector) + if do_connect: self.reconnect(connector) def after_connection(self): if self.createdb: @@ -4198,7 +4198,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter): def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.types.update({ 'boolean': gae.BooleanProperty, 'string': (lambda: gae.StringProperty(multiline=True)), @@ -4657,7 +4657,7 @@ class CouchDBAdapter(NoSQLAdapter): def __init__(self,db,uri='couchdb://127.0.0.1:5984', pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.uri = uri self.find_driver(adapter_args) @@ -4818,7 +4818,7 @@ class MongoDBAdapter(NoSQLAdapter): def __init__(self,db,uri='mongodb://127.0.0.1:5984/db', pool_size=0,folder=None,db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): self.db = db self.uri = uri self.find_driver(adapter_args) @@ -5419,7 +5419,7 @@ class IMAPAdapter(NoSQLAdapter): db_codec ='UTF-8', credential_decoder=IDENTITY, driver_args={}, - adapter_args={}): + adapter_args={}, do_connect=True): # db uri: user@example.com:password@imap.server.com:123 # TODO: max size adapter argument for preventing large mail transfers @@ -5487,7 +5487,7 @@ class IMAPAdapter(NoSQLAdapter): return connection self.db.define_tables = self.define_tables - self.reconnect(connector) + if do_connect: self.reconnect(connector) def reconnect(self, f, cursor=True): """ From 1a22497b64cf233460477031f8ce07fb9f0a7c84 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 30 Sep 2012 14:45:47 -0500 Subject: [PATCH 78/78] self.connector --- VERSION | 2 +- gluon/dal.py | 69 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/VERSION b/VERSION index f2d89e3a..e657a8d6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-30 14:19:41) dev +Version 2.0.9 (2012-09-30 14:45:39) dev diff --git a/gluon/dal.py b/gluon/dal.py index 00965668..d477f0c2 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -549,10 +549,8 @@ class ConnectionPool(object): """ if getattr(self,'connection',None) != None: return - if not f is None: - self._connection_function = f - else: - f = self._connection_function + if f is None: + f = self.connector if not self.pool_size: self.connection = f() @@ -2078,7 +2076,8 @@ class SQLiteAdapter(BaseAdapter): driver_args['detect_types'] = self.driver.PARSE_DECLTYPES def connector(dbpath=dbpath, driver_args=driver_args): return self.driver.Connection(dbpath, **driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.connection.create_function('web2py_extract', 2, @@ -2141,7 +2140,8 @@ class SpatiaLiteAdapter(SQLiteAdapter): driver_args['detect_types'] = self.driver.PARSE_DECLTYPES def connector(dbpath=dbpath, driver_args=driver_args): return self.driver.Connection(dbpath, **driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.connection.enable_load_extension(True) @@ -2242,7 +2242,8 @@ class JDBCSQLiteAdapter(SQLiteAdapter): return self.driver.connect( self.driver.getConnection('jdbc:sqlite:'+dbpath), **driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): # FIXME http://www.zentus.com/sqlitejdbc/custom_functions.html for UDFs @@ -2359,7 +2360,8 @@ class MySQLAdapter(BaseAdapter): def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.execute('SET FOREIGN_KEY_CHECKS=1;') @@ -2486,7 +2488,8 @@ class PostgreSQLAdapter(BaseAdapter): self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__) def connector(msg=msg,driver_args=driver_args): return self.driver.connect(msg,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.connection.set_client_encoding('UTF8') @@ -2700,7 +2703,8 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter): msg = ('jdbc:postgresql://%s:%s/%s' % (host, port, db), user, password) def connector(msg=msg,driver_args=driver_args): return self.driver.connect(*msg,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.connection.set_client_encoding('UTF8') @@ -2809,7 +2813,8 @@ class OracleAdapter(BaseAdapter): driver_args['threaded']=True def connector(uri=ruri,driver_args=driver_args): return self.driver.connect(uri,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';") @@ -3011,7 +3016,8 @@ class MSSQLAdapter(BaseAdapter): % (host, port, db, user, password, urlargs) def connector(cnxn=cnxn,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def lastrowid(self,table): #self.execute('SELECT @@IDENTITY;') @@ -3201,7 +3207,8 @@ class SybaseAdapter(MSSQLAdapter): def connector(dsn=dsn,driver_args=driver_args): return self.driver.connect(dsn,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def integrity_error_class(self): return RuntimeError # FIX THIS @@ -3306,7 +3313,8 @@ class FireBirdAdapter(BaseAdapter): def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def create_sequence_and_triggers(self, query, table, **args): tablename = table._tablename @@ -3365,7 +3373,8 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter): def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() class InformixAdapter(BaseAdapter): drivers = ('informixdb',) @@ -3468,7 +3477,8 @@ class InformixAdapter(BaseAdapter): driver_args.update(user=user,password=password,autocommit=True) def connector(dsn=dsn,driver_args=driver_args): return self.driver.connect(dsn,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def execute(self,command): if command[-1:]==';': @@ -3549,7 +3559,8 @@ class DB2Adapter(BaseAdapter): ruri = uri.split('://', 1)[1] def connector(cnxn=ruri,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def execute(self,command): if command[-1:]==';': @@ -3611,7 +3622,8 @@ class TeradataAdapter(BaseAdapter): ruri = uri.split('://', 1)[1] def connector(cnxn=ruri,driver_args=driver_args): return self.driver.connect(cnxn,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def LEFT_JOIN(self): return 'LEFT OUTER JOIN' @@ -3703,7 +3715,8 @@ class IngresAdapter(BaseAdapter): trace=trace) def connector(driver_args=driver_args): return self.driver.connect(**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def create_sequence_and_triggers(self, query, table, **args): # post create table auto inc code (if needed) @@ -3843,7 +3856,8 @@ class SAPDBAdapter(BaseAdapter): host=host, driver_args=driver_args): return self.driver.Connection(user, password, database, host, **driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def lastrowid(self,table): self.execute("select %s.NEXTVAL from dual" % table._sequence_name) @@ -3889,7 +3903,8 @@ class CubridAdapter(MySQLAdapter): def connector(host=host,port=port,db=db, user=user,passwd=password,driver_args=driver_args): return self.driver.connect(host,port,db,user,passwd,**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): self.execute('SET FOREIGN_KEY_CHECKS=1;') @@ -4010,7 +4025,8 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): driver_args['database'] = db def connector(driver_args=driver_args): return rdbms.connect(**driver_args) - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def after_connection(self): if self.createdb: @@ -5487,7 +5503,8 @@ class IMAPAdapter(NoSQLAdapter): return connection self.db.define_tables = self.define_tables - if do_connect: self.reconnect(connector) + self.connector = connector + if do_connect: self.reconnect() def reconnect(self, f, cursor=True): """ @@ -5501,10 +5518,8 @@ class IMAPAdapter(NoSQLAdapter): """ if getattr(self,'connection',None) != None: return - if not f is None: - self._connection_function = f - else: - f = self._connection_function + if f is None: + f = self.connector if not self.pool_size: self.connection = f()