From: Jeroen Ruigrok van der Werven Date: Sat, 5 Mar 2011 15:06:28 +0000 (+0000) Subject: Get rid of the utility code for itemgetter(), we now simply import this X-Git-Tag: 1.0~212 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80068a53fdf1a9a0fc79b669c32d9adc221f094c;p=thirdparty%2Fbabel.git Get rid of the utility code for itemgetter(), we now simply import this from operator. --- diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py index c794252f..3a203b1f 100644 --- a/babel/messages/jslexer.py +++ b/babel/messages/jslexer.py @@ -15,11 +15,9 @@ extractor. """ +from operator import itemgetter import re -from babel.util import itemgetter - - operators = [ '+', '-', '*', '%', '!=', '==', '<', '>', '<=', '>=', '=', '+=', '-=', '*=', '%=', '<<', '>>', '>>>', '<<=', '>>=', diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py index 610c3804..ebb091ac 100644 --- a/babel/messages/plurals.py +++ b/babel/messages/plurals.py @@ -14,7 +14,7 @@ """Plural form definitions.""" from babel.core import default_locale, Locale -from babel.util import itemgetter +from operator import itemgetter LC_CTYPE = default_locale('LC_CTYPE') diff --git a/babel/util.py b/babel/util.py index f1c3c652..dd5b9059 100644 --- a/babel/util.py +++ b/babel/util.py @@ -20,11 +20,6 @@ import re import textwrap import time from itertools import izip, imap -try: - from operator import itemgetter -except ImportError: - def itemgetter(item): - return lambda obj: obj[item] missing = object()