summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xchrome/common/extensions/docs/server2/build_server.py7
-rwxr-xr-xchrome/common/extensions/docs/server2/compiled_file_system_test.py19
-rwxr-xr-xchrome/common/extensions/docs/server2/object_store_creator_test.py8
-rwxr-xr-xchrome/common/extensions/docs/server2/preview.py15
-rw-r--r--tools/json_comment_eater.py40
-rw-r--r--tools/json_comment_eater/everything.json13
-rw-r--r--tools/json_comment_eater/everything_expected.json13
-rw-r--r--tools/json_comment_eater/json_comment_eater.py60
-rwxr-xr-xtools/json_comment_eater/json_comment_eater_test.py26
-rw-r--r--tools/json_schema_compiler/json_parse.py3
-rw-r--r--tools/json_schema_compiler/memoize.py13
-rw-r--r--tools/json_schema_compiler/model.py30
-rwxr-xr-xtools/json_to_struct/json_to_struct.py2
13 files changed, 180 insertions, 69 deletions
diff --git a/chrome/common/extensions/docs/server2/build_server.py b/chrome/common/extensions/docs/server2/build_server.py
index 4605ab9..276213f 100755
--- a/chrome/common/extensions/docs/server2/build_server.py
+++ b/chrome/common/extensions/docs/server2/build_server.py
@@ -15,7 +15,8 @@ SRC_DIR = os.path.join(sys.path[0], os.pardir, os.pardir, os.pardir, os.pardir,
THIRD_PARTY_DIR = os.path.join(SRC_DIR, 'third_party')
LOCAL_THIRD_PARTY_DIR = os.path.join(sys.path[0], 'third_party')
TOOLS_DIR = os.path.join(SRC_DIR, 'tools')
-SCHEMA_COMPILER_FILES = ['model.py',
+SCHEMA_COMPILER_FILES = ['memoize.py',
+ 'model.py',
'idl_schema.py',
'schema_util.py',
'json_parse.py']
@@ -64,7 +65,9 @@ def main():
CopyThirdParty(os.path.join(TOOLS_DIR, 'json_schema_compiler'),
'json_schema_compiler',
SCHEMA_COMPILER_FILES)
- CopyThirdParty(TOOLS_DIR, 'json_schema_compiler', ['json_comment_eater.py'])
+ CopyThirdParty(os.path.join(TOOLS_DIR, 'json_comment_eater'),
+ 'json_schema_compiler',
+ ['json_comment_eater.py'])
CopyThirdParty(os.path.join(THIRD_PARTY_DIR, 'simplejson'),
os.path.join('json_schema_compiler', 'simplejson'),
make_init=False)
diff --git a/chrome/common/extensions/docs/server2/compiled_file_system_test.py b/chrome/common/extensions/docs/server2/compiled_file_system_test.py
index d8bf452..25d5990 100755
--- a/chrome/common/extensions/docs/server2/compiled_file_system_test.py
+++ b/chrome/common/extensions/docs/server2/compiled_file_system_test.py
@@ -49,13 +49,16 @@ class CompiledFileSystemTest(unittest.TestCase):
def testIdentityFromFileListing(self):
compiled_fs = _CreateFactory().GetOrCreateIdentity()
- self.assertEqual({'404.html', 'apps/a11y.html', 'apps/about_apps.html',
- 'apps/fakedir/file.html',
- 'extensions/activeTab.html', 'extensions/alarms.html'},
+ self.assertEqual(set(('404.html',
+ 'apps/a11y.html',
+ 'apps/about_apps.html',
+ 'apps/fakedir/file.html',
+ 'extensions/activeTab.html',
+ 'extensions/alarms.html')),
set(compiled_fs.GetFromFileListing('/')))
- self.assertEqual({'a11y.html', 'about_apps.html', 'fakedir/file.html'},
+ self.assertEqual(set(('a11y.html', 'about_apps.html', 'fakedir/file.html')),
set(compiled_fs.GetFromFileListing('apps/')))
- self.assertEqual({'file.html'},
+ self.assertEqual(set(('file.html',)),
set(compiled_fs.GetFromFileListing('apps/fakedir')))
def testPopulateNamespace(self):
@@ -92,18 +95,18 @@ class CompiledFileSystemTest(unittest.TestCase):
def testCaching(self):
compiled_fs = _CreateFactory().GetOrCreateIdentity()
self.assertEqual('404.html contents', compiled_fs.GetFromFile('404.html'))
- self.assertEqual({'file.html'},
+ self.assertEqual(set(('file.html',)),
set(compiled_fs.GetFromFileListing('apps/fakedir')))
compiled_fs._file_system._obj['404.html'] = 'boom'
compiled_fs._file_system._obj['apps']['fakedir']['boom.html'] = 'blam'
self.assertEqual('404.html contents', compiled_fs.GetFromFile('404.html'))
- self.assertEqual({'file.html'},
+ self.assertEqual(set(('file.html',)),
set(compiled_fs.GetFromFileListing('apps/fakedir')))
compiled_fs._file_system.IncrementStat()
self.assertEqual('boom', compiled_fs.GetFromFile('404.html'))
- self.assertEqual({'file.html', 'boom.html'},
+ self.assertEqual(set(('file.html', 'boom.html')),
set(compiled_fs.GetFromFileListing('apps/fakedir')))
def testFailures(self):
diff --git a/chrome/common/extensions/docs/server2/object_store_creator_test.py b/chrome/common/extensions/docs/server2/object_store_creator_test.py
index 05a55c4..b821c88 100755
--- a/chrome/common/extensions/docs/server2/object_store_creator_test.py
+++ b/chrome/common/extensions/docs/server2/object_store_creator_test.py
@@ -32,10 +32,10 @@ class ObjectStoreCreatorTest(unittest.TestCase):
self.assertEqual('_FooClass/mat/43', store.namespace)
def testIllegalIinput(self):
- self.assertRaises(self.creator.Create, category='5')
- self.assertRaises(self.creator.Create, category='forty2')
- self.assertRaises(self.creator.Create, version='twenty')
- self.assertRaises(self.creator.Create, version='7a')
+ self.assertRaises(AssertionError, self.creator.Create, category='5')
+ self.assertRaises(AssertionError, self.creator.Create, category='forty2')
+ self.assertRaises(AssertionError, self.creator.Create, version='twenty')
+ self.assertRaises(AssertionError, self.creator.Create, version='7a')
if __name__ == '__main__':
unittest.main()
diff --git a/chrome/common/extensions/docs/server2/preview.py b/chrome/common/extensions/docs/server2/preview.py
index 9917f5f..a1d0e64 100755
--- a/chrome/common/extensions/docs/server2/preview.py
+++ b/chrome/common/extensions/docs/server2/preview.py
@@ -34,6 +34,7 @@ import os
import shutil
from StringIO import StringIO
import sys
+import time
import urlparse
import build_server
@@ -96,6 +97,8 @@ if __name__ == '__main__':
'the server, e.g. apps/storage.html. The path may optionally end '
'with #n where n is the number of times to render the page before '
'printing it, e.g. apps/storage.html#50, to use for profiling.')
+ parser.add_option('-t', '--time', action='store_true',
+ help='Print the time taken rendering rather than the result.')
(opts, argv) = parser.parse_args()
@@ -117,6 +120,9 @@ if __name__ == '__main__':
path = opts.render
extra_iterations = 0
+ if opts.time:
+ start_time = time.time()
+
content, status, headers = _Render(path)
if status in [301, 302]:
# Handle a single level of redirection.
@@ -130,9 +136,12 @@ if __name__ == '__main__':
for _ in range(extra_iterations):
_Render(path)
- # Static paths will show up as /stable/static/foo but this only makes sense
- # from a webserver.
- print(content.replace('/stable/static', 'static'))
+ if opts.time:
+ print('Took %s seconds' % (time.time() - start_time))
+ else:
+ # Static paths will show up as /stable/static/foo but this only makes
+ # sense from a webserver.
+ print(content.replace('/stable/static', 'static'))
exit()
print('Starting previewserver on port %s' % opts.port)
diff --git a/tools/json_comment_eater.py b/tools/json_comment_eater.py
deleted file mode 100644
index 1b1e07a84..0000000
--- a/tools/json_comment_eater.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-""" Utility to remove comments from JSON files so that they can be parsed by
-json.loads."""
-
-def _ReadString(input, start, output):
- output.append('"')
- in_escape = False
- for pos in xrange(start, len(input)):
- output.append(input[pos])
- if in_escape:
- in_escape = False
- else:
- if input[pos] == '\\':
- in_escape = True
- elif input[pos] == '"':
- return pos + 1
- return pos
-
-def _ReadComment(input, start, output):
- for pos in xrange(start, len(input)):
- if input[pos] in ['\r', '\n']:
- output.append(input[pos])
- return pos + 1
- return pos
-
-def Nom(input):
- output = []
- pos = 0
- while pos < len(input):
- if input[pos] == '"':
- pos = _ReadString(input, pos + 1, output)
- elif input[pos:pos+2] == '//':
- pos = _ReadComment(input, pos + 2, output)
- else:
- output.append(input[pos])
- pos += 1
- return ''.join(output)
diff --git a/tools/json_comment_eater/everything.json b/tools/json_comment_eater/everything.json
new file mode 100644
index 0000000..31db503
--- /dev/null
+++ b/tools/json_comment_eater/everything.json
@@ -0,0 +1,13 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test API.
+{ "namespace": "test",
+ "comments": "yo", // Comments all have a // in them.
+ "strings": "yes", // Comment with "strings" and " character
+ "escaped\"": "string\"isescaped",
+ "more//": "\"more",
+ "so\\many": "\\\\escapes\\\\\"whoa",
+ "comment//inmiddle": "of string"
+}
diff --git a/tools/json_comment_eater/everything_expected.json b/tools/json_comment_eater/everything_expected.json
new file mode 100644
index 0000000..3fa02c1
--- /dev/null
+++ b/tools/json_comment_eater/everything_expected.json
@@ -0,0 +1,13 @@
+
+
+
+
+
+{ "namespace": "test",
+ "comments": "yo",
+ "strings": "yes",
+ "escaped\"": "string\"isescaped",
+ "more//": "\"more",
+ "so\\many": "\\\\escapes\\\\\"whoa",
+ "comment//inmiddle": "of string"
+}
diff --git a/tools/json_comment_eater/json_comment_eater.py b/tools/json_comment_eater/json_comment_eater.py
new file mode 100644
index 0000000..8587464
--- /dev/null
+++ b/tools/json_comment_eater/json_comment_eater.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+'''Utility to remove comments from JSON files so that they can be parsed by
+json.loads.
+'''
+
+def _Rcount(string, chars):
+ '''Returns the number of consecutive characters from |chars| that occur at the
+ end of |string|.
+ '''
+ return len(string) - len(string.rstrip(chars))
+
+def _FindNextToken(string, tokens, start):
+ '''Finds the next token in |tokens| that occurs in |string| from |start|.
+ Returns a tuple (index, token key).
+ '''
+ min_index, min_key = (-1, None)
+ for k in tokens:
+ index = string.find(k, start)
+ if index != -1 and (min_index == -1 or index < min_index):
+ min_index, min_key = (index, k)
+ return (min_index, min_key)
+
+def _ReadString(input, start, output):
+ output.append('"')
+ start_range, end_range = (start, input.find('"', start))
+ # \" escapes the ", \\" doesn't, \\\" does, etc.
+ while (end_range != -1 and
+ _Rcount(input[start_range:end_range], '\\') % 2 == 1):
+ start_range, end_range = (end_range, input.find('"', end_range + 1))
+ if end_range == -1:
+ return start_range + 1
+ output.append(input[start:end_range + 1])
+ return end_range + 1
+
+def _ReadComment(input, start, output):
+ eol_tokens = ('\n', '\r')
+ eol_token_index, eol_token = _FindNextToken(input, eol_tokens, start)
+ if eol_token is None:
+ return len(input)
+ output.append(eol_token)
+ return eol_token_index + len(eol_token)
+
+def Nom(input):
+ token_actions = {
+ '"': _ReadString,
+ '//': _ReadComment,
+ }
+ output = []
+ pos = 0
+ while pos < len(input):
+ token_index, token = _FindNextToken(input, token_actions.keys(), pos)
+ if token is None:
+ output.append(input[pos:])
+ break
+ output.append(input[pos:token_index])
+ pos = token_actions[token](input, token_index + len(token), output)
+ return ''.join(output)
diff --git a/tools/json_comment_eater/json_comment_eater_test.py b/tools/json_comment_eater/json_comment_eater_test.py
new file mode 100755
index 0000000..5a230eb
--- /dev/null
+++ b/tools/json_comment_eater/json_comment_eater_test.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from json_comment_eater import Nom
+import unittest
+
+class JsonCommentEaterTest(unittest.TestCase):
+ def _Load(self, test_name):
+ '''Loads the input and expected output for |test_name| as given by reading
+ in |test_name|.json and |test_name|_expected.json, and returns the string
+ contents as a tuple in that order.
+ '''
+ def read(file_name):
+ with open(file_name, 'r') as f:
+ return f.read()
+ return [read(pattern % test_name)
+ for pattern in ('%s.json', '%s_expected.json')]
+
+ def testEverything(self):
+ json, expected_json = self._Load('everything')
+ self.assertEqual(expected_json, Nom(json))
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/tools/json_schema_compiler/json_parse.py b/tools/json_schema_compiler/json_parse.py
index 7ac1ff2..9502e91 100644
--- a/tools/json_schema_compiler/json_parse.py
+++ b/tools/json_schema_compiler/json_parse.py
@@ -10,7 +10,8 @@ import sys
_FILE_PATH = os.path.dirname(os.path.realpath(__file__))
_SYS_PATH = sys.path[:]
try:
- _COMMENT_EATER_PATH = os.path.join(_FILE_PATH, os.pardir)
+ _COMMENT_EATER_PATH = os.path.join(
+ _FILE_PATH, os.pardir, 'json_comment_eater')
sys.path.insert(0, _COMMENT_EATER_PATH)
import json_comment_eater
finally:
diff --git a/tools/json_schema_compiler/memoize.py b/tools/json_schema_compiler/memoize.py
new file mode 100644
index 0000000..1402a6e
--- /dev/null
+++ b/tools/json_schema_compiler/memoize.py
@@ -0,0 +1,13 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+def memoize(fn):
+ '''Decorates |fn| to memoize.
+ '''
+ memory = {}
+ def impl(*args):
+ if args not in memory:
+ memory[args] = fn(*args)
+ return memory[args]
+ return impl
diff --git a/tools/json_schema_compiler/model.py b/tools/json_schema_compiler/model.py
index 3dfc3b2..d6b6efc 100644
--- a/tools/json_schema_compiler/model.py
+++ b/tools/json_schema_compiler/model.py
@@ -2,11 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import copy
import os.path
-import re
from json_parse import OrderedDict
+from memoize import memoize
class ParseException(Exception):
"""Thrown when data in the model is invalid.
@@ -373,15 +372,26 @@ class PropertyType(object):
BINARY = _PropertyTypeInfo(False, "binary")
ANY = _PropertyTypeInfo(False, "any")
+@memoize
def UnixName(name):
- """Returns the unix_style name for a given lowerCamelCase string.
- """
- # First replace any lowerUpper patterns with lower_Upper.
- s1 = re.sub('([a-z])([A-Z])', r'\1_\2', name)
- # Now replace any ACMEWidgets patterns with ACME_Widgets
- s2 = re.sub('([A-Z]+)([A-Z][a-z])', r'\1_\2', s1)
- # Finally, replace any remaining periods, and make lowercase.
- return s2.replace('.', '_').lower()
+ '''Returns the unix_style name for a given lowerCamelCase string.
+ '''
+ unix_name = []
+ for i, c in enumerate(name):
+ if c.isupper() and i > 0:
+ # Replace lowerUpper with lower_Upper.
+ if name[i - 1].islower():
+ unix_name.append('_')
+ # Replace ACMEWidgets with ACME_Widgets
+ elif i + 1 < len(name) and name[i + 1].islower():
+ unix_name.append('_')
+ if c == '.':
+ # Replace hello.world with hello_world.
+ unix_name.append('_')
+ else:
+ # Everything is lowercase.
+ unix_name.append(c.lower())
+ return ''.join(unix_name)
def _StripNamespace(name, namespace):
if name.startswith(namespace.name + '.'):
diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_to_struct.py
index d4f90c5..38b6341 100755
--- a/tools/json_to_struct/json_to_struct.py
+++ b/tools/json_to_struct/json_to_struct.py
@@ -54,7 +54,7 @@ import optparse
import re
_script_path = os.path.realpath(__file__)
-sys.path.insert(0, os.path.normpath(_script_path + "/../../"))
+sys.path.insert(0, os.path.normpath(_script_path + "/../../json_comment_eater"))
try:
import json_comment_eater
finally:
generated by cgit v1.1 at 2025-02-06 17:46:52 +0000