diff --git a/gluon/__init__.py b/gluon/__init__.py index 9ff79614..c0e306f2 100644 --- a/gluon/__init__.py +++ b/gluon/__init__.py @@ -16,8 +16,8 @@ __all__ = ['A', 'B', 'BEAUTIFY', 'BODY', 'BR', 'CAT', 'CENTER', 'CLEANUP', 'CODE import os import sys try: - sys.path.append(os.path.join( - os.path.dirname(os.path.abspath(__file__)), "packages", "dal")) + sys.path.insert(1,os.path.join( + os.path.dirname(os.path.abspath(__file__)), "packages", "dal")) import pydal sys.modules['pydal'] = pydal except ImportError: diff --git a/gluon/contrib/hypermedia.py b/gluon/contrib/hypermedia.py index e6901f1a..03aec2ff 100644 --- a/gluon/contrib/hypermedia.py +++ b/gluon/contrib/hypermedia.py @@ -26,8 +26,7 @@ def api(): 'DELETE':{'query':None}, }, } - return Collection(db).process(request,response,policies) - + return Collection(db).process(request, response, policies) """ __all__ = ['Collection'] @@ -226,8 +225,7 @@ class Collection(object): id = row.id for name in ('slug','fullname','title','name'): if name in row: - href = URL(args=(tablename,id,IS_SLUG.urlify(row[name] or '')), - scheme=True) + href = URL(args=(tablename,id),scheme=True) break else: href = URL(args=(tablename,id),scheme=True) diff --git a/gluon/dal.py b/gluon/dal.py index b1414515..d73720cf 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -15,7 +15,6 @@ from pydal import Field from pydal.objects import Row, Rows, Table, Query, Set, Expression from pydal import SQLCustomType, geoPoint, geoLine, geoPolygon - def _default_validators(db, field): """ Field type validation, using web2py's validators mechanism. diff --git a/gluon/packages/dal b/gluon/packages/dal index dba8fa82..dbcb240f 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit dba8fa826b58764f1e4f6190db924294f8436f30 +Subproject commit dbcb240fe5be53ddaf9b5e935caeb8b5718ad90c