diff options
author | Armin Ronacher <armin.ronacher@active-4.com> | 2008-06-14 19:00:35 +0000 |
---|---|---|
committer | Armin Ronacher <armin.ronacher@active-4.com> | 2008-06-14 19:00:35 +0000 |
commit | 2f4ca2051945343f0ec217d9f83e0f96d7f3eb0d (patch) | |
tree | 4b9e5ff6d0521c96086fa7581c70511879160cd8 /babel | |
parent | 4626f01a103487f3118e362ccf48e74ca315101c (diff) | |
download | babel-2f4ca2051945343f0ec217d9f83e0f96d7f3eb0d.tar.gz |
added some newlines to extract and jslexer to stay consistent with the rest of the sourcecode.
Diffstat (limited to 'babel')
-rw-r--r-- | babel/messages/extract.py | 6 | ||||
-rw-r--r-- | babel/messages/jslexer.py | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/babel/messages/extract.py b/babel/messages/extract.py index 4914c17..1a1862e 100644 --- a/babel/messages/extract.py +++ b/babel/messages/extract.py @@ -66,6 +66,7 @@ def _strip_comment_tags(comments, tags): return line comments[:] = map(_strip, comments) + def extract_from_dir(dirname=os.getcwd(), method_map=DEFAULT_MAPPING, options_map=None, keywords=DEFAULT_KEYWORDS, comment_tags=(), callback=None, strip_comment_tags=False): @@ -171,6 +172,7 @@ def extract_from_dir(dirname=os.getcwd(), method_map=DEFAULT_MAPPING, yield filename, lineno, message, comments break + def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS, comment_tags=(), options=None, strip_comment_tags=False): """Extract messages from a specific file. @@ -200,6 +202,7 @@ def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS, finally: fileobj.close() + def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(), options=None, strip_comment_tags=False): """Extract messages from the given file-like object using the specified @@ -319,12 +322,14 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(), yield lineno, messages, comments + def extract_nothing(fileobj, keywords, comment_tags, options): """Pseudo extractor that does not actually extract anything, but simply returns an empty list. """ return [] + def extract_python(fileobj, keywords, comment_tags, options): """Extract messages from Python source code. @@ -429,6 +434,7 @@ def extract_python(fileobj, keywords, comment_tags, options): elif tok == NAME and value in keywords: funcname = value + def extract_javascript(fileobj, keywords, comment_tags, options): """Extract messages from JavaScript source code. diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py index a5f4436..9c666f0 100644 --- a/babel/messages/jslexer.py +++ b/babel/messages/jslexer.py @@ -58,6 +58,7 @@ uni_escape_re = re.compile(r'[a-fA-F0-9]{1,4}') class TokenError(ValueError): """Raised if the tokenizer stumbled upon invalid tokens.""" + class Token(tuple): """Represents a token as returned by `tokenize`.""" __slots__ = () @@ -69,6 +70,7 @@ class Token(tuple): value = property(itemgetter(1)) lineno = property(itemgetter(2)) + def indicates_division(token): """A helper function that helps the tokenizer to decide if the current token may be followed by a division operator. @@ -77,6 +79,7 @@ def indicates_division(token): return token.value in (')', ']', '}', '++', '--') return token.type in ('name', 'number', 'string', 'regexp') + def unquote_string(string): """Unquote a string with JavaScript rules. The string has to start with string delimiters (``'`` or ``"``.) @@ -134,6 +137,7 @@ def unquote_string(string): return u''.join(result) + def tokenize(source): """Tokenize a JavaScript source. |