Author: ianb
Date: 2006-09-10 12:10:08 -0600 (Sun, 10 Sep 2006)
New Revision: 1928
Modified:
FormEncode/trunk/formencode/api.py
FormEncode/trunk/tests/test_doctests.py
Log:
Improved doctest runner slightly; put in real implementations of
validate_python/validate_other
Modified: FormEncode/trunk/formencode/api.py
===================================================================
--- FormEncode/trunk/formencode/api.py 2006-09-09 15:06:33 UTC (rev 1927)
+++ FormEncode/trunk/formencode/api.py 2006-09-10 18:10:08 UTC (rev 1928)
@@ -312,13 +312,13 @@
else:
return self.empty_value(value)
vo = self.validate_other
- if vo:
+ if vo and vo is not self._validate_noop:
vo(value, state)
tp = self._to_python
if tp:
value = tp(value, state)
vp = self.validate_python
- if vp:
+ if vp and vp is not self._validate_noop:
vp(value, state)
return value
except Invalid:
@@ -339,13 +339,13 @@
else:
return self.empty_value(value)
vp = self.validate_python
- if vp:
+ if vp and vp is not self._validate_noop:
vp(value, state)
fp = self._from_python
if fp:
value = fp(value, state)
vo = self.validate_other
- if vo:
+ if vo and co is not self._validate_noop:
vo(value, state)
return value
else:
@@ -380,9 +380,14 @@
newlines.
"""
return value.encode('base64').strip().replace('\n', '')
+
+ def _validate_noop(self, value, state):
+ """
+ A validation method that doesn't do anything.
+ """
+ pass
- validate_python = None
- validate_other = None
+ validate_python = validate_other = _validate_noop
_to_python = None
_from_python = None
Modified: FormEncode/trunk/tests/test_doctests.py
===================================================================
--- FormEncode/trunk/tests/test_doctests.py 2006-09-09 15:06:33 UTC (rev
1927)
+++ FormEncode/trunk/tests/test_doctests.py 2006-09-10 18:10:08 UTC (rev
1928)
@@ -26,14 +26,20 @@
if __name__ == '__main__':
import sys
args = sys.argv[1:]
+ verbose = False
+ if '-v' in args:
+ args.remove('-v')
+ verbose = True
if not args:
args = text_files + modules
for fn in args:
if isinstance(fn, str):
fn = os.path.join(base, fn)
doctest.testfile(fn, module_relative=False,
- optionflags=doctest.ELLIPSIS)
+ optionflags=doctest.ELLIPSIS,
+ verbose=verbose)
else:
- doctest.testmod(fn, optionflags=doctest.ELLIPSIS)
+ doctest.testmod(fn, optionflags=doctest.ELLIPSIS,
+ verbose=verbose)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
FormEncode-CVS mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/formencode-cvs
