[svn] commit: r2441 - in /branches/trac284/src: bin/auth/ bin/bindctl/ bin/cmdctl/ bin/cmdctl/tests/ bin/xfrin/ bin/xfrout/ lib/config/testdata/ lib/python/isc/cc/ lib/python/isc/config/
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jul 8 15:48:59 UTC 2010
Author: jelte
Date: Thu Jul 8 15:48:58 2010
New Revision: 2441
Log:
update literal_eval calls to also use json.loads
json has a few things tiny bit different, and the parser in python is stricter than absolutely necessary, so had to update a few spec and test data files
Modified:
branches/trac284/src/bin/auth/auth.spec.pre.in
branches/trac284/src/bin/bindctl/bindcmd.py
branches/trac284/src/bin/cmdctl/cmdctl.spec.pre.in
branches/trac284/src/bin/cmdctl/tests/cmdctl_test.py
branches/trac284/src/bin/xfrin/xfrin.spec.pre.in
branches/trac284/src/bin/xfrout/xfrout.spec.pre.in
branches/trac284/src/lib/config/testdata/b10-config.db
branches/trac284/src/lib/config/testdata/data22_1.data
branches/trac284/src/lib/config/testdata/data22_2.data
branches/trac284/src/lib/config/testdata/data22_3.data
branches/trac284/src/lib/config/testdata/data22_4.data
branches/trac284/src/lib/config/testdata/data22_5.data
branches/trac284/src/lib/config/testdata/data22_6.data
branches/trac284/src/lib/config/testdata/data22_7.data
branches/trac284/src/lib/config/testdata/data22_8.data
branches/trac284/src/lib/config/testdata/spec10.spec
branches/trac284/src/lib/config/testdata/spec11.spec
branches/trac284/src/lib/config/testdata/spec12.spec
branches/trac284/src/lib/config/testdata/spec13.spec
branches/trac284/src/lib/config/testdata/spec14.spec
branches/trac284/src/lib/config/testdata/spec15.spec
branches/trac284/src/lib/config/testdata/spec17.spec
branches/trac284/src/lib/config/testdata/spec2.spec
branches/trac284/src/lib/config/testdata/spec20.spec
branches/trac284/src/lib/config/testdata/spec22.spec
branches/trac284/src/lib/config/testdata/spec23.spec
branches/trac284/src/lib/config/testdata/spec24.spec
branches/trac284/src/lib/config/testdata/spec27.spec
branches/trac284/src/lib/config/testdata/spec3.spec
branches/trac284/src/lib/config/testdata/spec4.spec
branches/trac284/src/lib/config/testdata/spec6.spec
branches/trac284/src/lib/config/testdata/spec9.spec
branches/trac284/src/lib/python/isc/cc/data.py
branches/trac284/src/lib/python/isc/config/cfgmgr.py
branches/trac284/src/lib/python/isc/config/module_spec.py
Modified: branches/trac284/src/bin/auth/auth.spec.pre.in
==============================================================================
--- branches/trac284/src/bin/auth/auth.spec.pre.in (original)
+++ branches/trac284/src/bin/auth/auth.spec.pre.in Thu Jul 8 15:48:58 2010
@@ -5,7 +5,7 @@
"config_data": [
{ "item_name": "database_file",
"item_type": "string",
- "item_optional": True,
+ "item_optional": true,
"item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
}
],
Modified: branches/trac284/src/bin/bindctl/bindcmd.py
==============================================================================
--- branches/trac284/src/bin/bindctl/bindcmd.py (original)
+++ branches/trac284/src/bin/bindctl/bindcmd.py Thu Jul 8 15:48:58 2010
@@ -35,7 +35,7 @@
import getpass
from hashlib import sha1
import csv
-import ast
+import json
import pwd
import getpass
import traceback
@@ -564,7 +564,7 @@
else:
parsed_value = None
try:
- parsed_value = ast.literal_eval(cmd.params['value'])
+ parsed_value = json.loads(cmd.params['value'])
except Exception as exc:
# ok could be an unquoted string, interpret as such
parsed_value = cmd.params['value']
Modified: branches/trac284/src/bin/cmdctl/cmdctl.spec.pre.in
==============================================================================
--- branches/trac284/src/bin/cmdctl/cmdctl.spec.pre.in (original)
+++ branches/trac284/src/bin/cmdctl/cmdctl.spec.pre.in Thu Jul 8 15:48:58 2010
@@ -6,20 +6,20 @@
{
"item_name": "key_file",
"item_type": "string",
- "item_optional": False,
- "item_default": '@@SYSCONFDIR@@/@PACKAGE@/cmdctl-keyfile.pem'
+ "item_optional": false,
+ "item_default": "@@SYSCONFDIR@@/@PACKAGE@/cmdctl-keyfile.pem"
},
{
"item_name": "cert_file",
"item_type": "string",
- "item_optional": False,
- "item_default": '@@SYSCONFDIR@@/@PACKAGE@/cmdctl-certfile.pem'
+ "item_optional": false,
+ "item_default": "@@SYSCONFDIR@@/@PACKAGE@/cmdctl-certfile.pem"
},
{
"item_name": "accounts_file",
"item_type": "string",
- "item_optional": False,
- "item_default": '@@SYSCONFDIR@@/@PACKAGE@/cmdctl-accounts.csv'
+ "item_optional": false,
+ "item_default": "@@SYSCONFDIR@@/@PACKAGE@/cmdctl-accounts.csv"
}
],
"commands": [
@@ -32,7 +32,7 @@
"command_name": "shutdown",
"command_description": "shutdown cmdctl",
"command_args": []
- },
+ }
]
}
}
Modified: branches/trac284/src/bin/cmdctl/tests/cmdctl_test.py
==============================================================================
--- branches/trac284/src/bin/cmdctl/tests/cmdctl_test.py (original)
+++ branches/trac284/src/bin/cmdctl/tests/cmdctl_test.py Thu Jul 8 15:48:58 2010
@@ -279,6 +279,7 @@
rcode, reply = self.handler._handle_post_request()
self.assertEqual(http.client.BAD_REQUEST, rcode)
+import sys
class MyCommandControl(CommandControl):
def _get_modules_specification(self):
return {}
Modified: branches/trac284/src/bin/xfrin/xfrin.spec.pre.in
==============================================================================
--- branches/trac284/src/bin/xfrin/xfrin.spec.pre.in (original)
+++ branches/trac284/src/bin/xfrin/xfrin.spec.pre.in Thu Jul 8 15:48:58 2010
@@ -6,37 +6,37 @@
{
"item_name": "transfers_in",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 10
}
],
"commands": [
{
- 'command_name': 'retransfer',
- "command_description": 'retransfer a single zone without checking zone serial number',
- 'command_args': [ {
+ "command_name": "retransfer",
+ "command_description": "retransfer a single zone without checking zone serial number",
+ "command_args": [ {
"item_name": "zone_name",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
},
{
"item_name": "master",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
},
{
"item_name": "port",
"item_type": "integer",
- "item_optional": True,
+ "item_optional": true,
"item_default": 53
},
{
"item_name": "db_file",
"item_type": "string",
- "item_optional": True,
- "item_default": '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
+ "item_optional": true,
+ "item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
}
]
},
Modified: branches/trac284/src/bin/xfrout/xfrout.spec.pre.in
==============================================================================
--- branches/trac284/src/bin/xfrout/xfrout.spec.pre.in (original)
+++ branches/trac284/src/bin/xfrout/xfrout.spec.pre.in Thu Jul 8 15:48:58 2010
@@ -5,43 +5,43 @@
{
"item_name": "transfers_out",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 10
},
{
"item_name": "db_file",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
},
{
"item_name": "log_name",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "Xfrout"
},
{
"item_name": "log_file",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/log/Xfrout.log"
},
{
"item_name": "log_severity",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "debug"
},
{
"item_name": "log_versions",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 5
},
{
"item_name": "log_max_bytes",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1048576
}
],
Modified: branches/trac284/src/lib/config/testdata/b10-config.db
==============================================================================
--- branches/trac284/src/lib/config/testdata/b10-config.db (original)
+++ branches/trac284/src/lib/config/testdata/b10-config.db Thu Jul 8 15:48:58 2010
@@ -1,1 +1,1 @@
-{'TestModule': {'test': 125}, 'version': 1}
+{"version": 1, "TestModule": {"test": 125}}
Modified: branches/trac284/src/lib/config/testdata/data22_1.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_1.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_1.data Thu Jul 8 15:48:58 2010
@@ -1,9 +1,9 @@
{
"value1": 1,
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
- "value6": { "v61": "bar", "v62": True },
+ "value6": { "v61": "bar", "v62": true },
"value9": { "v91": "hi", "v92": { "v92a": "Hi", "v92b": 3 } }
}
Modified: branches/trac284/src/lib/config/testdata/data22_2.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_2.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_2.data Thu Jul 8 15:48:58 2010
@@ -1,8 +1,8 @@
{
"value1": "asdf",
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
- "value6": { "v61": "bar", "v62": True }
+ "value6": { "v61": "bar", "v62": true }
}
Modified: branches/trac284/src/lib/config/testdata/data22_3.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_3.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_3.data Thu Jul 8 15:48:58 2010
@@ -1,8 +1,8 @@
{
"value1": 1,
- "value2": False,
- "value3": True,
+ "value2": false,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
- "value6": { "v61": "bar", "v62": True }
+ "value6": { "v61": "bar", "v62": true }
}
Modified: branches/trac284/src/lib/config/testdata/data22_4.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_4.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_4.data Thu Jul 8 15:48:58 2010
@@ -1,8 +1,8 @@
{
"value1": 1,
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, "a" ],
- "value6": { "v61": "bar", "v62": True }
+ "value6": { "v61": "bar", "v62": true }
}
Modified: branches/trac284/src/lib/config/testdata/data22_5.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_5.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_5.data Thu Jul 8 15:48:58 2010
@@ -1,7 +1,7 @@
{
"value1": 1,
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
"value6": { "v61": "bar", "v62": "Break" }
Modified: branches/trac284/src/lib/config/testdata/data22_6.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_6.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_6.data Thu Jul 8 15:48:58 2010
@@ -1,10 +1,10 @@
{
"value1": 1,
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
- "value6": { "v61": "bar", "v62": True },
- "value7": [ 1, 2.2, "str", True ],
+ "value6": { "v61": "bar", "v62": true },
+ "value7": [ 1, 2.2, "str", true ],
"value9": { "v91": "hi", "v92": { "v92a": "Hi", "v92b": 3 } }
}
Modified: branches/trac284/src/lib/config/testdata/data22_7.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_7.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_7.data Thu Jul 8 15:48:58 2010
@@ -1,10 +1,10 @@
{
"value1": 1,
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
- "value6": { "v61": "bar", "v62": True },
+ "value6": { "v61": "bar", "v62": true },
"value8": [ { "a": "d" }, { "a": "e" } ],
"value9": { "v91": "hi", "v92": { "v92a": "Hi", "v92b": 3 } }
}
Modified: branches/trac284/src/lib/config/testdata/data22_8.data
==============================================================================
--- branches/trac284/src/lib/config/testdata/data22_8.data (original)
+++ branches/trac284/src/lib/config/testdata/data22_8.data Thu Jul 8 15:48:58 2010
@@ -1,9 +1,9 @@
{
"value1": 1,
"value2": 2.3,
- "value3": True,
+ "value3": true,
"value4": "foo",
"value5": [ 1, 2, 3 ],
- "value6": { "v61": "bar", "v62": True },
+ "value6": { "v61": "bar", "v62": true },
"value8": [ { "a": "d" }, { "a": 1 } ]
}
Modified: branches/trac284/src/lib/config/testdata/spec10.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec10.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec10.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "real",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec11.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec11.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec11.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "boolean",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec12.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec12.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec12.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec13.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec13.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec13.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "list",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec14.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec14.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec14.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec15.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec15.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec15.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "badname",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec17.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec17.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec17.spec Thu Jul 8 15:48:58 2010
@@ -7,7 +7,7 @@
"command_args": [ {
"item_name": "message",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
} ]
}
Modified: branches/trac284/src/lib/config/testdata/spec2.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec2.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec2.spec Thu Jul 8 15:48:58 2010
@@ -4,48 +4,48 @@
"config_data": [
{ "item_name": "item1",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
},
{ "item_name": "item2",
"item_type": "real",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1.1
},
{ "item_name": "item3",
"item_type": "boolean",
- "item_optional": False,
- "item_default": True
+ "item_optional": false,
+ "item_default": true
},
{ "item_name": "item4",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "test"
},
{ "item_name": "item5",
"item_type": "list",
- "item_optional": False,
+ "item_optional": false,
"item_default": [ "a", "b" ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
}
},
{ "item_name": "item6",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "value1",
"item_type": "string",
- "item_optional": True,
+ "item_optional": true,
"item_default": "default"
},
{ "item_name": "value2",
"item_type": "integer",
- "item_optional": True
+ "item_optional": true
}
]
}
@@ -57,7 +57,7 @@
"command_args": [ {
"item_name": "message",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
} ]
},
Modified: branches/trac284/src/lib/config/testdata/spec20.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec20.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec20.spec Thu Jul 8 15:48:58 2010
@@ -8,7 +8,7 @@
"command_args": [ {
"item_name": "message",
"item_type": "somethingbad",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
} ]
}
Modified: branches/trac284/src/lib/config/testdata/spec22.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec22.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec22.spec Thu Jul 8 15:48:58 2010
@@ -4,75 +4,75 @@
"config_data": [
{ "item_name": "value1",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 9
},
{ "item_name": "value2",
"item_type": "real",
- "item_optional": False,
+ "item_optional": false,
"item_default": 9.9
},
{ "item_name": "value3",
"item_type": "boolean",
- "item_optional": False,
- "item_default": False
+ "item_optional": false,
+ "item_default": false
},
{ "item_name": "value4",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "default_string"
},
{ "item_name": "value5",
"item_type": "list",
- "item_optional": False,
+ "item_optional": false,
"item_default": [ "a", "b" ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 8
}
},
{ "item_name": "value6",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "v61",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "def"
},
{ "item_name": "v62",
"item_type": "boolean",
- "item_optional": False,
- "item_default": False
+ "item_optional": false,
+ "item_default": false
}
]
},
{ "item_name": "value7",
"item_type": "list",
- "item_optional": True,
+ "item_optional": true,
"item_default": [ ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "any",
- "item_optional": True
+ "item_optional": true
}
},
{ "item_name": "value8",
"item_type": "list",
- "item_optional": True,
+ "item_optional": true,
"item_default": [ ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "map",
- "item_optional": True,
+ "item_optional": true,
"item_default": { "a": "b" },
"map_item_spec": [
{ "item_name": "a",
"item_type": "string",
- "item_optional": True,
+ "item_optional": true,
"item_default": "empty"
}
]
@@ -80,28 +80,28 @@
},
{ "item_name": "value9",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "v91",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "def"
},
{ "item_name": "v92",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "v92a",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "Hello"
} ,
{
"item_name": "v92b",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 47806
}
]
Modified: branches/trac284/src/lib/config/testdata/spec23.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec23.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec23.spec Thu Jul 8 15:48:58 2010
@@ -8,7 +8,7 @@
"command_args": [ {
"item_name": "message",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
} ]
}
Modified: branches/trac284/src/lib/config/testdata/spec24.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec24.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec24.spec Thu Jul 8 15:48:58 2010
@@ -4,11 +4,11 @@
"config_data": [
{ "item_name": "item",
"item_type": "list",
- "item_optional": True,
+ "item_optional": true,
"list_item_spec": {
"item_name": "list_element",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": ""
}
}
Modified: branches/trac284/src/lib/config/testdata/spec27.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec27.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec27.spec Thu Jul 8 15:48:58 2010
@@ -3,81 +3,81 @@
"module_name": "Spec27",
"commands": [
{
- 'command_name': 'cmd1',
+ "command_name": "cmd1",
"command_description": "command_for_unittest",
- 'command_args': [
+ "command_args": [
{
"item_name": "value1",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 9
},
{ "item_name": "value2",
"item_type": "real",
- "item_optional": False,
+ "item_optional": false,
"item_default": 9.9
},
{ "item_name": "value3",
"item_type": "boolean",
- "item_optional": False,
- "item_default": False
+ "item_optional": false,
+ "item_default": false
},
{ "item_name": "value4",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "default_string"
},
{ "item_name": "value5",
"item_type": "list",
- "item_optional": False,
+ "item_optional": false,
"item_default": [ "a", "b" ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 8
}
},
{ "item_name": "value6",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "v61",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "def"
},
{ "item_name": "v62",
"item_type": "boolean",
- "item_optional": False,
- "item_default": False
+ "item_optional": false,
+ "item_default": false
}
]
},
{ "item_name": "value7",
"item_type": "list",
- "item_optional": True,
+ "item_optional": true,
"item_default": [ ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "any",
- "item_optional": True
+ "item_optional": true
}
},
{ "item_name": "value8",
"item_type": "list",
- "item_optional": True,
+ "item_optional": true,
"item_default": [ ],
"list_item_spec": {
"item_name": "list_element",
"item_type": "map",
- "item_optional": True,
+ "item_optional": true,
"item_default": { "a": "b" },
"map_item_spec": [
{ "item_name": "a",
"item_type": "string",
- "item_optional": True,
+ "item_optional": true,
"item_default": "empty"
}
]
@@ -85,28 +85,28 @@
},
{ "item_name": "value9",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "v91",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "def"
},
{ "item_name": "v92",
"item_type": "map",
- "item_optional": False,
+ "item_optional": false,
"item_default": {},
"map_item_spec": [
{ "item_name": "v92a",
"item_type": "string",
- "item_optional": False,
+ "item_optional": false,
"item_default": "Hello"
} ,
{
"item_name": "v92b",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 47806
}
]
Modified: branches/trac284/src/lib/config/testdata/spec3.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec3.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec3.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec4.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec4.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec4.spec Thu Jul 8 15:48:58 2010
@@ -3,7 +3,7 @@
"module_name": "Spec2",
"config_data": [
{ "item_name": "item1",
- "item_optional": False,
+ "item_optional": false,
"item_default": 1
}
]
Modified: branches/trac284/src/lib/config/testdata/spec6.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec6.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec6.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "integer",
- "item_optional": False
+ "item_optional": false
}
]
}
Modified: branches/trac284/src/lib/config/testdata/spec9.spec
==============================================================================
--- branches/trac284/src/lib/config/testdata/spec9.spec (original)
+++ branches/trac284/src/lib/config/testdata/spec9.spec Thu Jul 8 15:48:58 2010
@@ -4,7 +4,7 @@
"config_data": [
{ "item_name": "item1",
"item_type": "integer",
- "item_optional": False,
+ "item_optional": false,
"item_default": "asdf"
}
]
Modified: branches/trac284/src/lib/python/isc/cc/data.py
==============================================================================
--- branches/trac284/src/lib/python/isc/cc/data.py (original)
+++ branches/trac284/src/lib/python/isc/cc/data.py Thu Jul 8 15:48:58 2010
@@ -20,7 +20,7 @@
# (int, real, bool, string, list and dict respectively)
#
-import ast
+import json
class DataNotFoundError(Exception): pass
class DataTypeError(Exception): pass
@@ -134,7 +134,7 @@
if type(value_str) != str:
return None
try:
- return ast.literal_eval(value_str)
+ return json.loads(value_str)
except ValueError as ve:
# simply return the string itself
return value_str
Modified: branches/trac284/src/lib/python/isc/config/cfgmgr.py
==============================================================================
--- branches/trac284/src/lib/python/isc/config/cfgmgr.py (original)
+++ branches/trac284/src/lib/python/isc/config/cfgmgr.py Thu Jul 8 15:48:58 2010
@@ -26,6 +26,7 @@
import os
import copy
import tempfile
+import json
from isc.cc import data
from isc.config import ccsession
@@ -67,7 +68,7 @@
config = ConfigManagerData(data_path, file_name)
try:
file = open(config.db_filename, 'r')
- file_config = ast.literal_eval(file.read())
+ file_config = json.loads(file.read())
if 'version' in file_config and \
file_config['version'] == ConfigManagerData.CONFIG_VERSION:
config.data = file_config
@@ -93,9 +94,9 @@
dir=self.data_path,
delete=False)
filename = file.name
- pp = pprint.PrettyPrinter(indent=4)
- s = pp.pformat(self.data)
- file.write(s)
+ #pp = pprint.PrettyPrinter(indent=4)
+ #s = pp.pformat(self.data)
+ file.write(json.dumps(self.data))
file.write("\n")
file.close()
if output_file_name:
Modified: branches/trac284/src/lib/python/isc/config/module_spec.py
==============================================================================
--- branches/trac284/src/lib/python/isc/config/module_spec.py (original)
+++ branches/trac284/src/lib/python/isc/config/module_spec.py Thu Jul 8 15:48:58 2010
@@ -21,7 +21,7 @@
set of data against the specification
"""
-import ast
+import json
import isc.cc.data
@@ -34,22 +34,30 @@
file"""
pass
+import sys
def module_spec_from_file(spec_file, check = True):
"""Returns a ModuleSpec object defined by the file at spec_file.
If check is True, the contents are verified. If there is an error
in those contents, a ModuleSpecError is raised."""
module_spec = None
if hasattr(spec_file, 'read'):
- module_spec = ast.literal_eval(spec_file.read(-1))
+
+ json_str = spec_file.read(-1)
+ module_spec = json.loads(json_str)
elif type(spec_file) == str:
file = open(spec_file)
- module_spec = ast.literal_eval(file.read(-1))
+ json_str = file.read(-1)
+ try:
+ module_spec = json.loads(json_str)
+ except Exception as err:
+ module_spec = {}
+
file.close()
else:
raise ModuleSpecError("spec_file not a str or file-like object")
if 'module_spec' not in module_spec:
raise ModuleSpecError("Data definition has no module_spec element")
-
+
result = ModuleSpec(module_spec['module_spec'], check)
return result
More information about the bind10-changes
mailing list