git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag myplc-5.2-2
[myplc.git]
/
plc_config.py
diff --git
a/plc_config.py
b/plc_config.py
index
fcab1f6
..
4203862
100644
(file)
--- a/
plc_config.py
+++ b/
plc_config.py
@@
-7,8
+7,6
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-#
import codecs
import os
import codecs
import os
@@
-840,9
+838,16
@@
DO NOT EDIT. This file was automatically generated at
return True
except: return False
return True
except: return False
+ def email_validator(val):
+ return re.match('\A[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9._\-]+\.[a-zA-Z]+\Z', val)
+
+ def boolean_validator (val):
+ return val in ['true', 'false']
+
validators = {
validators = {
- 'email' : lambda val: re.match('\A[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9._\-]+\.[a-zA-Z]+\Z', val),
- 'ip': ip_validator
+ 'email' : email_validator,
+ 'ip': ip_validator,
+ 'boolean': boolean_validator,
}
# validate it if not a know type.
}
# validate it if not a know type.
@@
-868,10
+873,6
@@
class TrimTextElement(xml.dom.minidom.Element):
####################
# GLOBAL VARIABLES
#
####################
# GLOBAL VARIABLES
#
-release_id = "$Id$"
-release_rev = "$Revision$"
-release_url = "$URL$"
-
g_configuration=None
usual_variables=None
config_dir=None
g_configuration=None
usual_variables=None
config_dir=None
@@
-1290,7
+1291,7
@@
def check_dir (config_file):
####################
def optParserSetup(configuration):
####################
def optParserSetup(configuration):
- parser = OptionParser(usage=usage()
, version="%prog " + release_rev + release_url
)
+ parser = OptionParser(usage=usage())
parser.set_defaults(config_dir=configuration['config_dir'],
service=configuration['service'],
usual_variables=configuration['usual_variables'])
parser.set_defaults(config_dir=configuration['config_dir'],
service=configuration['service'],
usual_variables=configuration['usual_variables'])