Cleanup round #1: get rid of the frozenset/set utility code and imports.

This is no longer needed with 2.4 and onward.

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index cd4c44bd19b88ddd53b8ef60e04c1851bc083951..d805dc9047f9ba536dbbee09d081b6b512845d72 100644 (file)
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -25,7 +25,7 @@ from babel import __version__ as VERSION
 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'

diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 3a9c80fc191822a24adbc4e626d8ada2380ab531..a1862b7fcf0cfb07fe111d423fe7c7f65a50deec 100644 (file)
--- 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 = [

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 7b8195f61358a7aa9aff95a2b40c68fd8ae1d496..eb2e19369c44b25966ea1135ecd7ff3ec923a711 100644 (file)
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -25,7 +25,7 @@ import os
 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']

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 94bf122cef137ef962e3b7dc8474848aedee5c4c..bbb207f1c1fa78dc872acc831bfd5e3e13514d8f 100644 (file)
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -24,7 +24,7 @@ import re
 
 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'

diff --git a/babel/plural.py b/babel/plural.py
index 129b5bafe48237ac3cd72e83b88274fc6bff6a4a..a8549253303b3a7feba2ff1b99416e4515530c07 100644 (file)
--- 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'

diff --git a/babel/util.py b/babel/util.py
index 400c07c0953719ef9b49ba7c2fea6083a4a21c1d..f1c3c6522de95425c41c0fc2a078f34b6344c68c 100644 (file)
--- a/babel/util.py
+++ b/babel/util.py
@@ -20,12 +20,6 @@ import re
 import textwrap
 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: