Mercurial > babel > old > mirror
changeset 527:5e1804d27d65
Cleanup round #1: get rid of the frozenset/set utility code and imports.
This is no longer needed with 2.4 and onward.
| author | jruigrok |
|---|---|
| date | Sat, 05 Mar 2011 14:59:20 +0000 |
| parents | f73435181ae3 |
| children | 86d221c0eb12 |
| files | babel/messages/catalog.py babel/messages/checkers.py babel/messages/extract.py babel/messages/pofile.py babel/plural.py babel/util.py |
| diffstat | 6 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -25,7 +25,7 @@ from babel.core import Locale from babel.dates import format_datetime from babel.messages.plurals import get_plural -from babel.util import odict, distinct, set, LOCALTZ, UTC, FixedOffsetTimezone +from babel.util import odict, distinct, LOCALTZ, UTC, FixedOffsetTimezone __all__ = ['Message', 'Catalog', 'TranslationError'] __docformat__ = 'restructuredtext en'
--- a/babel/messages/checkers.py +++ b/babel/messages/checkers.py @@ -18,7 +18,6 @@ from itertools import izip from babel.messages.catalog import TranslationError, PYTHON_FORMAT -from babel.util import set #: list of format chars that are compatible to each other _string_format_compatibilities = [
--- a/babel/messages/extract.py +++ b/babel/messages/extract.py @@ -25,7 +25,7 @@ import sys from tokenize import generate_tokens, COMMENT, NAME, OP, STRING -from babel.util import parse_encoding, pathmatch, relpath, set +from babel.util import parse_encoding, pathmatch, relpath from textwrap import dedent __all__ = ['extract', 'extract_from_dir', 'extract_from_file']
--- a/babel/messages/pofile.py +++ b/babel/messages/pofile.py @@ -24,7 +24,7 @@ from babel import __version__ as VERSION from babel.messages.catalog import Catalog, Message -from babel.util import set, wraptext, LOCALTZ +from babel.util import wraptext, LOCALTZ __all__ = ['read_po', 'write_po'] __docformat__ = 'restructuredtext en'
--- a/babel/plural.py +++ b/babel/plural.py @@ -15,8 +15,6 @@ import re -from babel.util import frozenset, set - __all__ = ['PluralRule', 'RuleError', 'to_gettext', 'to_javascript', 'to_python'] __docformat__ = 'restructuredtext en'
--- a/babel/util.py +++ b/babel/util.py @@ -21,12 +21,6 @@ import time from itertools import izip, imap try: - # assigned so they're importable - frozenset = frozenset - set = set -except NameError: - from sets import ImmutableSet as frozenset, Set as set -try: from operator import itemgetter except ImportError: def itemgetter(item):