dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validatos no longer depend on T

Browse Source
This commit is contained in:
mdipierro
2019-02-24 01:51:18 -08:00
parent afaf57f6da
commit b58b7da18f
13 changed files with 129 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tests/test_appadmin.py
+2 -2
View File
@@ -11,7 +11,7 @@ import unittest
from gluon.compileapp import run_controller_in, run_view_in, compile_application, remove_compiled_application
from gluon.languages import translator
from gluon.languages import TranslatorFactory
from gluon.storage import Storage, List
from gluon import fileutils
from gluon.dal import DAL, Field, Table
@@ -50,7 +50,7 @@ class TestAppAdmin(unittest.TestCase):
request.env.remote_addr = '127.0.0.1'
response = Response()
session = Session()
T = translator('', 'en')
T = TranslatorFactory('', 'en')
session.connect(request, response)
current.request = request
current.response = response
gluon/tests/test_authapi.py
+2 -2
View File
@@ -5,7 +5,7 @@
import os
import unittest
from gluon.globals import Request, Response, Session
from gluon.languages import translator
from gluon.languages import TranslatorFactory
from gluon.dal import DAL, Field
from gluon.authapi import AuthAPI
from gluon.storage import Storage
@@ -24,7 +24,7 @@ class TestAuthAPI(unittest.TestCase):
self.request.folder = 'applications/admin'
self.response = Response()
self.session = Session()
T = translator('', 'en')
T = TranslatorFactory('', 'en')
self.session.connect(self.request, self.response)
from gluon.globals import current
self.current = current
gluon/tests/test_cache.py
+1 -1
View File
@@ -120,7 +120,7 @@ class TestCache(unittest.TestCase):
s = Storage({'application': 'admin',
'folder': 'applications/admin'})
cache = Cache(s)
db = DAL(check_reserved=['all'])
db = DAL('sqlite:memory', check_reserved=['all'])
db.define_table('t_a', Field('f_a'))
db.t_a.insert(f_a='test')
db.commit()
gluon/tests/test_dal.py
+1 -1
View File
@@ -32,7 +32,7 @@ class TestDALSubclass(unittest.TestCase):
def testSerialization(self):
from gluon._compat import pickle
db = DAL(check_reserved=['all'])
db = DAL('sqlite:memory', check_reserved=['all'])
db.define_table('t_a', Field('f_a'))
db.t_a.insert(f_a='test')
a = db(db.t_a.id > 0).select(cacheable=True)
gluon/tests/test_languages.py
+3 -3
View File
@@ -88,7 +88,7 @@ class TestTranslations(unittest.TestCase):
pass
def test_plain(self):
T = languages.translator(self.langpath, self.http_accept_language)
T = languages.TranslatorFactory(self.langpath, self.http_accept_language)
self.assertEqual(str(T('Hello World')),
'Hello World')
self.assertEqual(str(T('Hello World## comment')),
@@ -340,7 +340,7 @@ class TestMessages(unittest.TestCase):
pass
def test_decode(self):
T = languages.translator(self.langpath, self.http_accept_language)
T = languages.TranslatorFactory(self.langpath, self.http_accept_language)
messages = Messages(T)
messages.update({'email_sent':'Email sent', 'test': "ä"})
self.assertEqual(to_unicode(messages.email_sent, 'utf-8'), 'Email sent')
@@ -359,7 +359,7 @@ class TestHTMLTag(unittest.TestCase):
pass
def test_decode(self):
T = languages.translator(self.langpath, self.http_accept_language)
T = languages.TranslatorFactory(self.langpath, self.http_accept_language)
elem = SPAN(T("Complete"))
self.assertEqual(elem.flatten(), "Complete")
elem = SPAN(T("Cannot be empty", language="ru"))
gluon/tests/test_scheduler.py
+2 -2
View File
@@ -11,7 +11,7 @@ import datetime
import sys
from gluon.storage import Storage
from gluon.languages import translator
from gluon.languages import TranslatorFactory
from gluon.scheduler import JobGraph, Scheduler, CronParser
from gluon.dal import DAL
@@ -25,7 +25,7 @@ class BaseTestScheduler(unittest.TestCase):
'folder': 'applications/welcome',
'controller': 'default'})
current.request = s
T = translator('', 'en')
T = TranslatorFactory('', 'en')
current.T = T
self.db = DAL('sqlite://dummy2.db', check_reserved=['all'])
gluon/tests/test_serializers.py
+2 -2
View File
@@ -13,7 +13,7 @@ import decimal
from gluon.serializers import *
from gluon.storage import Storage
# careful with the import path 'cause of isinstance() checks
from gluon.languages import translator
from gluon.languages import TranslatorFactory
from gluon.html import SPAN
@@ -46,7 +46,7 @@ class TestSerializers(unittest.TestCase):
obj = {'a': decimal.Decimal('4.312312312312')}
self.assertEqual(json(obj), u'{"a": "4.312312312312"}')
# lazyT translated
T = translator('', 'en')
T = TranslatorFactory('', 'en')
lazy_translation = T('abc')
self.assertEqual(json(lazy_translation), u'"abc"')
# html helpers are xml()ed before too
gluon/tests/test_sqlhtml.py
+3 -3
View File
@@ -18,7 +18,7 @@ from pydal.objects import Table
from gluon.tools import Auth, Mail
from gluon.globals import Request, Response, Session
from gluon.storage import Storage
from gluon.languages import translator
from gluon.languages import TranslatorFactory
from gluon.http import HTTP
from gluon.validators import *
@@ -254,7 +254,7 @@ class TestSQLFORM(unittest.TestCase):
request.folder = 'applications/admin'
response = Response()
session = Session()
T = translator('', 'en')
T = TranslatorFactory('', 'en')
session.connect(request, response)
from gluon.globals import current
current.request = request
@@ -355,7 +355,7 @@ class TestSQLTABLE(unittest.TestCase):
request.folder = 'applications/admin'
response = Response()
session = Session()
T = translator('', 'en')
T = TranslatorFactory('', 'en')
session.connect(request, response)
from gluon.globals import current
current.request = request
gluon/tests/test_tools.py
+4 -4
View File
@@ -21,7 +21,7 @@ from gluon.tools import Auth, Mail, Recaptcha2, prettydate, Expose
from gluon._compat import PY2, to_bytes
from gluon.globals import Request, Response, Session
from gluon.storage import Storage
from gluon.languages import translator
from gluon.languages import TranslatorFactory
from gluon.http import HTTP
from gluon import SPAN, H3, TABLE, TR, TD, A, URL, current
@@ -271,7 +271,7 @@ class TestAuthJWT(unittest.TestCase):
# request.folder = 'applications/admin'
# response = Response()
# session = Session()
# T = translator('', 'en')
# T = TranslatorFactory('', 'en')
# session.connect(request, response)
# from gluon.globals import current
# current.request = request
@@ -434,7 +434,7 @@ class TestAuthJWT(unittest.TestCase):
# # request.folder = 'applications/admin'
# # response = Response()
# # session = Session()
# # T = translator('', 'en')
# # T = TranslatorFactory('', 'en')
# # session.connect(request, response)
# # from gluon.globals import current
# # current.request = request
@@ -495,7 +495,7 @@ class TestAuth(unittest.TestCase):
self.request.folder = 'applications/admin'
self.response = Response()
self.session = Session()
T = translator('', 'en')
T = TranslatorFactory('', 'en')
self.session.connect(self.request, self.response)
from gluon.globals import current
self.current = current
gluon/tests/test_validators.py
+1 -2
View File
@@ -20,8 +20,7 @@ class TestValidators(unittest.TestCase):
def test_MISC(self):
""" Test miscelaneous utility functions and some general behavior guarantees """
from gluon.validators import translate, options_sorter, Validator, UTC
self.assertEqual(translate(None), None)
from gluon.validators import options_sorter, Validator, UTC
self.assertEqual(options_sorter(('a', 'a'), ('a', 'a')), -1)
self.assertEqual(options_sorter(('A', 'A'), ('a', 'a')), -1)
self.assertEqual(options_sorter(('b', 'b'), ('a', 'a')), 1)