From: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
Date: Sat, 5 Mar 2011 14:59:20 +0000 (+0000)
Subject: Cleanup round #1: get rid of the frozenset/set utility code and imports.
X-Git-Tag: 1.0~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84498294e2768f427fa7f4ff801546ada2ad7c4a;p=thirdparty%2Fbabel.git

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 cd4c44bd..d805dc90 100644
--- 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 3a9c80fc..a1862b7f 100644
--- 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 7b8195f6..eb2e1936 100644
--- 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 94bf122c..bbb207f1 100644
--- 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 129b5baf..a8549253 100644
--- 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 400c07c0..f1c3c652 100644
--- 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: