|
 |
821497 |
diff -up Beaker-1.3.1/beaker/converters.py.bak Beaker-1.3.1/beaker/converters.py
|
|
|
821497 |
--- Beaker-1.3.1/beaker/converters.py.bak 2008-02-28 16:02:30.000000000 -0500
|
|
|
821497 |
+++ Beaker-1.3.1/beaker/converters.py 2010-06-28 20:58:33.032604522 -0400
|
|
|
821497 |
@@ -1,26 +1,29 @@
|
|
|
821497 |
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
|
|
|
821497 |
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
|
|
|
821497 |
-def asbool(obj):
|
|
|
821497 |
- if isinstance(obj, (str, unicode)):
|
|
|
821497 |
- obj = obj.strip().lower()
|
|
|
821497 |
- if obj in ['true', 'yes', 'on', 'y', 't', '1']:
|
|
|
821497 |
- return True
|
|
|
821497 |
- elif obj in ['false', 'no', 'off', 'n', 'f', '0']:
|
|
|
821497 |
- return False
|
|
|
821497 |
- else:
|
|
|
821497 |
- raise ValueError(
|
|
|
821497 |
- "String is not true/false: %r" % obj)
|
|
|
821497 |
- return bool(obj)
|
|
|
821497 |
+try:
|
|
|
821497 |
+ from paste.util.converters import asbool, aslist
|
|
|
821497 |
+except ImportError:
|
|
|
821497 |
+ # (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
|
|
|
821497 |
+ # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
|
|
|
821497 |
+ def asbool(obj):
|
|
|
821497 |
+ if isinstance(obj, (str, unicode)):
|
|
|
821497 |
+ obj = obj.strip().lower()
|
|
|
821497 |
+ if obj in ['true', 'yes', 'on', 'y', 't', '1']:
|
|
|
821497 |
+ return True
|
|
|
821497 |
+ elif obj in ['false', 'no', 'off', 'n', 'f', '0']:
|
|
|
821497 |
+ return False
|
|
|
821497 |
+ else:
|
|
|
821497 |
+ raise ValueError(
|
|
|
821497 |
+ "String is not true/false: %r" % obj)
|
|
|
821497 |
+ return bool(obj)
|
|
|
821497 |
|
|
|
821497 |
-def aslist(obj, sep=None, strip=True):
|
|
|
821497 |
- if isinstance(obj, (str, unicode)):
|
|
|
821497 |
- lst = obj.split(sep)
|
|
|
821497 |
- if strip:
|
|
|
821497 |
- lst = [v.strip() for v in lst]
|
|
|
821497 |
- return lst
|
|
|
821497 |
- elif isinstance(obj, (list, tuple)):
|
|
|
821497 |
- return obj
|
|
|
821497 |
- elif obj is None:
|
|
|
821497 |
- return []
|
|
|
821497 |
- else:
|
|
|
821497 |
- return [obj]
|
|
|
821497 |
+ def aslist(obj, sep=None, strip=True):
|
|
|
821497 |
+ if isinstance(obj, (str, unicode)):
|
|
|
821497 |
+ lst = obj.split(sep)
|
|
|
821497 |
+ if strip:
|
|
|
821497 |
+ lst = [v.strip() for v in lst]
|
|
|
821497 |
+ return lst
|
|
|
821497 |
+ elif isinstance(obj, (list, tuple)):
|
|
|
821497 |
+ return obj
|
|
|
821497 |
+ elif obj is None:
|
|
|
821497 |
+ return []
|
|
|
821497 |
+ else:
|
|
|
821497 |
+ return [obj]
|