Moved PYTHON_FORMAT back to catalog.

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index e4bb7adc0e1ab0b1693f5e632875b4cc7bfe7018..829eebc10495ee1b3d27f63b236c3e8d485e7ae4 100644 (file)
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -28,13 +28,24 @@ from babel import __version__ as VERSION
 from babel.core import Locale
 from babel.dates import format_datetime
 from babel.messages.plurals import PLURALS
-from babel.util import odict, distinct, LOCALTZ, UTC, FixedOffsetTimezone, \
-     PYTHON_FORMAT
+from babel.util import odict, distinct, LOCALTZ, UTC, FixedOffsetTimezone
 
 __all__ = ['Message', 'Catalog', 'TranslationError']
 __docformat__ = 'restructuredtext en'
 
 
+PYTHON_FORMAT = re.compile(r'''(?x)
+    \%
+        (?:\(([\w]*)\))?
+        (
+            [-#0\ +]?(?:\*|[\d]+)?
+            (?:\.(?:\*|[\d]+))?
+            [hlL]?
+        )
+        ([diouxXeEfFgGcrs%])
+''')
+
+
 class Message(object):
     """Representation of a single message in a catalog."""
 

diff --git a/babel/util.py b/babel/util.py
index 9842150dcad10c22225ffef92721d38db607e19e..b59918f6f8fee5b9a36a838a24a8dd3b0ae0484d 100644 (file)
--- a/babel/util.py
+++ b/babel/util.py
@@ -31,17 +31,6 @@ __all__ = ['distinct', 'pathmatch', 'relpath', 'wraptext', 'odict', 'UTC',
 __docformat__ = 'restructuredtext en'
 
 
-PYTHON_FORMAT = re.compile(r'''(?x)
-    \%
-        (?:\(([\w]*)\))?
-        (
-            [-#0\ +]?(?:\*|[\d]+)?
-            (?:\.(?:\*|[\d]+))?
-            [hlL]?
-        )
-        ([diouxXeEfFgGcrs%])
-''')
-
 def distinct(iterable):
     """Yield all items in an iterable collection that are distinct.