diff --git a/VERSION b/VERSION index 5132036b..ec33540d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-16 11:15:52) dev +Version 2.00.0 (2012-05-21 16:49:59) dev diff --git a/gluon/dal.py b/gluon/dal.py index 1ed4b799..d4378eb9 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -283,6 +283,12 @@ if not 'google' in drivers: except ImportError: logger.debug('no MSSQL/DB2/Teradata driver') + try: + import Sybase + drivers.append('Sybase') + except ImportError: + logger.debug('no Sybase driver') + try: import kinterbasdb drivers.append('Interbase') @@ -1124,7 +1130,9 @@ class BaseAdapter(ConnectionPool): elif not isinstance(expression.op, str): return expression.op() else: - return '(%s)' % expression.op + op = expression.op + if op.endswith(';'): op=op[:-1] + return '(%s)' % op elif field_type: return str(self.represent(expression,field_type)) elif isinstance(expression,(list,tuple)): @@ -2747,6 +2755,101 @@ class MSSQL2Adapter(MSSQLAdapter): def execute(self,a): return self.log_execute(a.decode('utf8')) +class SybaseAdapter(MSSQLAdapter): + + driver = globals().get('Sybase',None) + + types = { + 'boolean': 'BIT', + 'string': 'CHAR VARYING(%(length)s)', + 'text': 'TEXT', + 'password': 'CHAR VARYING(%(length)s)', + 'blob': 'IMAGE', + 'upload': 'CHAR VARYING(%(length)s)', + 'integer': 'INT', + 'bigint': 'BIGINT', + 'float': 'FLOAT', + 'double': 'FLOAT', + 'decimal': 'NUMERIC(%(precision)s,%(scale)s)', + 'date': 'DATETIME', + 'time': 'CHAR(8)', + 'datetime': 'DATETIME', + 'id': 'INT IDENTITY PRIMARY KEY', + 'reference': 'INT NULL, CONSTRAINT %(constraint_name)s FOREIGN KEY (%(field_name)s) REFERENCES %(foreign_key)s ON DELETE %(on_delete_action)s', + 'list:integer': 'TEXT', + 'list:string': 'TEXT', + 'list:reference': 'TEXT', + 'geometry': 'geometry', + 'geography': 'geography', + 'big-id': 'BIGINT IDENTITY PRIMARY KEY', + 'big-reference': 'BIGINT NULL, CONSTRAINT %(constraint_name)s FOREIGN KEY (%(field_name)s) REFERENCES %(foreign_key)s ON DELETE %(on_delete_action)s', + 'reference FK': ', CONSTRAINT FK_%(constraint_name)s FOREIGN KEY (%(field_name)s) REFERENCES %(foreign_key)s ON DELETE %(on_delete_action)s', + 'reference TFK': ' CONSTRAINT FK_%(foreign_table)s_PK FOREIGN KEY (%(field_name)s) REFERENCES %(foreign_table)s (%(foreign_key)s) ON DELETE %(on_delete_action)s', + } + + + def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', + credential_decoder=lambda x:x, driver_args={}, + adapter_args={}, fake_connect=False, srid=4326): + ### Fix this for sybase + if not self.driver: + raise RuntimeError, "Unable to import driver" + self.db = db + self.dbengine = "sybase" + self.uri = uri + self.pool_size = pool_size + self.folder = folder + self.db_codec = db_codec + self.srid = srid + self.find_or_make_work_folder() + # ## read: http://bytes.com/groups/python/460325-cx_oracle-utf8 + uri = uri.split('://')[1] + if '@' not in uri: + try: + m = re.compile('^(?P.+)$').match(uri) + if not m: + raise SyntaxError, \ + 'Parsing uri string(%s) has no result' % self.uri + dsn = m.group('dsn') + if not dsn: + raise SyntaxError, 'DSN required' + except SyntaxError, e: + logger.error('NdGpatch error') + raise e + else: + m = re.compile('^(?P[^:@]+)(\:(?P[^@]*))?@(?P[^\:/]+)(\:(?P[0-9]+))?/(?P[^\?]+)(\?(?P.*))?$').match(uri) + if not m: + raise SyntaxError, \ + "Invalid URI string in DAL: %s" % uri + user = credential_decoder(m.group('user')) + if not user: + raise SyntaxError, 'User required' + password = credential_decoder(m.group('password')) + if not password: + password = '' + host = m.group('host') + if not host: + raise SyntaxError, 'Host name required' + db = m.group('db') + if not db: + raise SyntaxError, 'Database name required' + port = m.group('port') or '1433' + + dsn = 'sybase:host=%s:%s;dbname=%s' % (host,port,db) + + driver_args.update(dict(user = credential_decoder(user), + password = credential_decoder(password), + locale = charset)) + + def connect(dsn=dsn,driver_args=driver_args): + return self.driver.connect(dsn,**driver_args) + if not fake_connect: + self.pool_connection(connect) + self.after_connection() + + def integrity_error_class(self): + return RuntimeError # FIX THIS + class FireBirdAdapter(BaseAdapter): @@ -5760,6 +5863,7 @@ ADAPTERS = { 'oracle': OracleAdapter, 'mssql': MSSQLAdapter, 'mssql2': MSSQL2Adapter, + 'sybase': SybaseAdapter, 'db2': DB2Adapter, 'teradata': TeradataAdapter, 'informix': InformixAdapter, @@ -6062,7 +6166,8 @@ def smart_query(fields,text): value = constants[item[1:]] else: value = item - if op == '=': op = 'like' + if field.type in ('text','string'): + if op == '=': op = 'like' if op == '=': new_query = field==value elif op == '<': new_query = field': new_query = field>value @@ -6512,7 +6617,8 @@ def index(): except ValueError: return Row({'status':400,'pattern':pattern, 'error':'invalid path','response':None}) - return Row({'status':200,'response':response,'pattern':pattern}) + return Row({'status':200,'response':response, + 'pattern':pattern,'count':count}) return Row({'status':400,'error':'no matching pattern','response':None}) @@ -7376,6 +7482,9 @@ class Expression(object): def len(self): return Expression(self.db, self.db._adapter.AGGREGATE, self, 'LENGTH', 'integer') + def avg(self): + return Expression(self.db, self.db._adapter.AGGREGATE, self, 'AVG', self.type) + def lower(self): return Expression(self.db, self.db._adapter.LOWER, self, None, self.type) @@ -7874,8 +7983,6 @@ class Field(Expression): return '.%s' % self.name -def raw(s): return Expression(None,s) - class Query(object): """ @@ -7964,7 +8071,7 @@ class Set(object): if isinstance(query,Table): query = query._id>0 elif isinstance(query,str): - query = raw(query) + query = Expression(self.db,query) elif isinstance(query,Field): query = query!=None if self.query: @@ -8002,6 +8109,9 @@ class Set(object): fields = adapter.expand_all(fields, adapter.tables(self.query)) return adapter.select(self.query,fields,attributes) + def nested_select(self,*fields,**attributes): + return Expression(self.db,self._select(*fields,**attributes)) + def delete(self): tablename=self.db._adapter.get_table(self.query) table = self.db[tablename] diff --git a/gluon/html.py b/gluon/html.py index 4d513e95..a42bd8e1 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -2150,10 +2150,11 @@ class MENU(DIV): if not select: select = SELECT(**self.attributes) for item in data: - if item[2]: - select.append(OPTION(CAT(prefix, item[0]), _value=item[2], _selected=item[1])) - if len(item)>3 and len(item[3]): - self.serialize_mobile(item[3], select, prefix = CAT(prefix, item[0], '/')) + if len(item) <= 4 or item[4] == True: + if item[2]: + select.append(OPTION(CAT(prefix, item[0]), _value=item[2], _selected=item[1])) + if len(item)>3 and len(item[3]): + self.serialize_mobile(item[3], select, prefix = CAT(prefix, item[0], '/')) select['_onchange'] = 'window.location=this.value' return select diff --git a/gluon/main.py b/gluon/main.py index 57bf6476..2f69c6ba 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -68,6 +68,13 @@ create_missing_folders() # set up logging for subsequent imports import logging import logging.config + +# This needed to prevent exception on Python 2.5: +# NameError: name 'gluon' is not defined +# See http://bugs.python.org/issue1436 +import gluon.messageboxhandler +logging.gluon = gluon + logpath = abspath("logging.conf") if os.path.exists(logpath): logging.config.fileConfig(abspath("logging.conf")) diff --git a/gluon/rewrite.py b/gluon/rewrite.py index 1e76acbb..b6ee5f6a 100644 --- a/gluon/rewrite.py +++ b/gluon/rewrite.py @@ -1016,13 +1016,16 @@ class MapUrlIn(object): self.request.args = self.args if self.language: self.request.uri_language = self.language - uri = '/%s/%s/%s' % (self.application, self.controller, self.function) + uri = '/%s/%s' % (self.controller, self.function) + app = self.application if self.map_hyphen: uri = uri.replace('_', '-') + app = app.replace('_', '-') if self.extension != 'html': uri += '.' + self.extension if self.language: uri = '/%s%s' % (self.language, uri) + uri = '/%s%s' % (app, uri) uri += self.args and urllib.quote('/' + '/'.join([str(x) for x in self.args])) or '' uri += (self.query and ('?' + self.query) or '') self.env['REQUEST_URI'] = uri diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 55fd6f7e..78942d11 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1323,7 +1323,7 @@ class SQLFORM(FORM): def smartdictform(session,name,filename=None,query=None,**kwargs): import os if query: - session[name] = db(query).select().first().as_dict() + session[name] = query.db(query).select().first().as_dict() elif os.path.exists(filename): env = {'datetime':datetime} session[name] = eval(open(filename).read(),{},env) @@ -1331,7 +1331,7 @@ class SQLFORM(FORM): if form.process().accepted: session[name].update(form.vars) if query: - db(query).update(**form.vars) + query.db(query).update(**form.vars) else: open(filename,'w').write(repr(session[name])) return form @@ -1546,27 +1546,27 @@ class SQLFORM(FORM): buttonurl=url(args=[]),callback=None,delete=None,trap=True): if showbuttontext: if callback: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), SPAN(T(buttontext),_title=buttontext, - _class=ui.get('buttontext','')), + _class=ui.get('buttontext')), callback=callback,delete=delete, - _class=trap_class(ui.get('button',''),trap)) + _class=trap_class(ui.get('button'),trap)) else: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), SPAN(T(buttontext),_title=buttontext, - _class=ui.get('buttontext','')), + _class=ui.get('buttontext')), _href=buttonurl, - _class=trap_class(ui.get('button',''),trap)) + _class=trap_class(ui.get('button'),trap)) else: if callback: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), callback=callback,delete=delete, _title=buttontext, - _class=trap_class(ui.get('buttontext',''),trap)) + _class=trap_class(ui.get('buttontext'),trap)) else: - return A(SPAN(_class=ui.get(buttonclass,'')), + return A(SPAN(_class=ui.get(buttonclass)), _href=buttonurl,_title=buttontext, - _class=trap_class(ui.get('buttontext',''),trap)) + _class=trap_class(ui.get('buttontext'),trap)) dbset = db(query) tablenames = db._adapter.tables(dbset.query) if left!=None: tablenames+=db._adapter.tables(left) @@ -1772,9 +1772,9 @@ class SQLFORM(FORM): else: orderby = (order[:1]=='~' and ~sort_field) or sort_field - head = TR(_class=ui.get('header','')) + head = TR(_class=ui.get('header')) if selectable: - head.append(TH(_class=ui.get('default',''))) + head.append(TH(_class=ui.get('default'))) for field in fields: if columns and not str(field) in columns: continue if not field.readable: continue @@ -1791,19 +1791,19 @@ class SQLFORM(FORM): header = A(header,marker,_href=url(vars=dict( keywords=request.vars.keywords or '', order=key)),_class=trap_class()) - head.append(TH(header, _class=ui.get('default',''))) + head.append(TH(header, _class=ui.get('default'))) if links and links_in_grid: for link in links: if isinstance(link,dict): - head.append(TH(link['header'], _class=ui.get('default',''))) + head.append(TH(link['header'], _class=ui.get('default'))) # Include extra column for buttons if needed. include_buttons_column = (details or editable or deletable or (links and links_in_grid and not all([isinstance(link, dict) for link in links]))) if include_buttons_column: - head.append(TH(_class=ui.get('default',''))) + head.append(TH(_class=ui.get('default'))) paginator = UL() if paginate and paginate%s" % (self.name, self.value) diff --git a/gluon/tools.py b/gluon/tools.py index 4d8c4188..e746c393 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -646,7 +646,7 @@ class Mail(object): server.ehlo() server.starttls() server.ehlo() - if not self.settings.login is None: + if not self.settings.login: server.login(*self.settings.login.split(':',1)) result = server.sendmail(self.settings.sender, to, payload.as_string()) server.quit() @@ -861,14 +861,14 @@ class Auth(object): """ @staticmethod - def get_or_create_key(filename=None): + def get_or_create_key(filename=None, alg='sha512'): request = current.request if not filename: filename = os.path.join(request.folder,'private','auth.key') if os.path.exists(filename): key = open(filename,'r').read().strip() else: - key = web2py_uuid() + key = alg+':'+web2py_uuid() open(filename,'w').write(key) return key diff --git a/gluon/widget.py b/gluon/widget.py index 2cab034e..185a1af6 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -896,7 +896,7 @@ def start(cron=True): if hasattr(options,key): setattr(options,key,getattr(options2,key)) - if not os.path.exists('logging.conf') and \ + if False and not os.path.exists('logging.conf') and \ os.path.exists('logging.example.conf'): import shutil sys.stdout.write("Copying logging.conf.example to logging.conf ... ") @@ -983,6 +983,17 @@ def start(cron=True): if root: root.focus_force() + + # Mac OS X - make the GUI window rise to the top + if os.path.exists("/usr/bin/osascript"): + applescript = """ +tell application "System Events" + set proc to first process whose unix id is %d + set frontmost of proc to true +end tell +""" % (os.getpid()) + os.system("/usr/bin/osascript -e '%s'" % applescript) + if not options.quiet: presentation(root) master = web2pyDialog(root, options) diff --git a/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh b/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh index 67a20db8..1d50f6ad 100644 --- a/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh +++ b/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh @@ -1,81 +1,79 @@ -#!/bin/bash - -echo 'setup-web2py-nginx-uwsgi-ubuntu.sh' -echo 'Requires Ubuntu 10.04 (LTS) and installs Nginx + uWSGI + Web2py' - -# Get Web2py Admin Password -echo -e "Web2py Admin Password: \c " -read PW - -# Upgrade and install needed software -apt-get update -apt-get -y upgrade -apt-get install python-software-properties -add-apt-repository ppa:nginx/stable -add-apt-repository ppa:uwsgi/release -apt-get update -apt-get -y install nginx-full -apt-get -y install uwsgi-python - -# Create configuration file /etc/nginx/sites-available/web2py -echo 'server { - listen 80; - server_name $hostname; - location ~* /(\w+)/static/ { - root /home/www-data/web2py/applications/; - } - location / { - uwsgi_pass 127.0.0.1:9001; - include uwsgi_params; - uwsgi_param UWSGI_SCHEME $scheme; - uwsgi_param SERVER_SOFTWARE nginx/$nginx_version; - } -} - -server { - listen 443; - server_name $hostname; - ssl on; - ssl_certificate /etc/nginx/ssl/web2py.crt; - ssl_certificate_key /etc/nginx/ssl/web2py.key; - location / { - uwsgi_pass 127.0.0.1:9001; - include uwsgi_params; - uwsgi_param UWSGI_SCHEME $scheme; - uwsgi_param SERVER_SOFTWARE nginx/$nginx_version; - } - -}' >/etc/nginx/sites-available/web2py - -ln -s /etc/nginx/sites-available/web2py /etc/nginx/sites-enabled/web2py -rm /etc/nginx/sites-enabled/default -rm /etc/nginx/sites-available/default -mkdir /etc/nginx/ssl -cd /etc/nginx/ssl -openssl genrsa -out web2py.key 1024 -openssl req -batch -new -key web2py.key -out web2py.csr -openssl x509 -req -days 1780 -in web2py.csr -signkey web2py.key -out web2py.crt - -# Create configuration file /etc/uwsgi-python/apps-available/web2py.xml -echo ' - 127.0.0.1:9001 - /home/www-data/web2py/ - - - -' >/etc/uwsgi-python/apps-available/web2py.xml -ln -s /etc/uwsgi-python/apps-available/web2py.xml /etc/uwsgi-python/apps-enabled/web2py.xml - -# Install Web2py -apt-get -y install unzip -cd /home -mkdir www-data -cd www-data -wget http://web2py.com/examples/static/web2py_src.zip -unzip web2py_src.zip -rm web2py_src.zip -chown -R www-data:www-data web2py -cd /home/www-data/web2py -sudo -u www-data python -c "from gluon.main import save_password; save_password('$PW',443)" -/etc/init.d/uwsgi-python restart -/etc/init.d/nginx restart +#!/bin/bash + +echo 'setup-web2py-nginx-uwsgi-ubuntu-precise.sh' +echo 'Requires Ubuntu 12.04 and installs Nginx + uWSGI + Web2py' + +# Get Web2py Admin Password +echo -e "Web2py Admin Password: \c " +read PW + +# Upgrade and install needed software +apt-get update +apt-get -y upgrade +apt-get -y dist-upgrade +apt-get autoremove +apt-get autoclean +apt-get -y install nginx-full +apt-get -y install uwsgi uwsgi-plugin-python + +# Create configuration file /etc/nginx/sites-available/web2py +echo 'server { + listen 80; + server_name $hostname; + location ~* /(\w+)/static/ { + root /home/www-data/web2py/applications/; + } + location / { + uwsgi_pass 127.0.0.1:9001; + include uwsgi_params; + uwsgi_param UWSGI_SCHEME $scheme; + uwsgi_param SERVER_SOFTWARE nginx/$nginx_version; + } +} + +server { + listen 443; + server_name $hostname; + ssl on; + ssl_certificate /etc/nginx/ssl/web2py.crt; + ssl_certificate_key /etc/nginx/ssl/web2py.key; + location / { + uwsgi_pass 127.0.0.1:9001; + include uwsgi_params; + uwsgi_param UWSGI_SCHEME $scheme; + uwsgi_param SERVER_SOFTWARE nginx/$nginx_version; + } + +}' >/etc/nginx/sites-available/web2py + +ln -s /etc/nginx/sites-available/web2py /etc/nginx/sites-enabled/web2py +rm /etc/nginx/sites-enabled/default +mkdir /etc/nginx/ssl +cd /etc/nginx/ssl +openssl genrsa -out web2py.key 1024 +openssl req -batch -new -key web2py.key -out web2py.csr +openssl x509 -req -days 1780 -in web2py.csr -signkey web2py.key -out web2py.crt + +# Create configuration file /etc/uwsgi/apps-available/web2py.xml +echo ' + python + 127.0.0.1:9001 + /home/www-data/web2py/ + + + +' >/etc/uwsgi/apps-available/web2py.xml +ln -s /etc/uwsgi/apps-available/web2py.xml /etc/uwsgi/apps-enabled/web2py.xml + +# Install Web2py +apt-get -y install unzip +mkdir /home/www-data +cd /home/www-data +wget http://web2py.com/examples/static/web2py_src.zip +unzip web2py_src.zip +rm web2py_src.zip +chown -R www-data:www-data web2py +cd /home/www-data/web2py +sudo -u www-data python -c "from gluon.main import save_password; save_password('$PW',443)" +/etc/init.d/uwsgi restart +/etc/init.d/nginx restart