summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-05 11:41:19 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-05 11:41:19 +0000
commit89c2fba23b8cfd856972ea25d838171cc67e8ce8 (patch)
tree626eb4521774af39a3d6a519b5a613dcae947dc0
parent5da08047b9ff074173e6a3dc6c9b5d5a03c89bf5 (diff)
[1.0.X] Fixed #9283 -- Deliberately silence one deprecation warning raised by python 2.6.
Backport of r9148 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management/commands/makemessages.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py
index c987dec926..ea7ed2f228 100644
--- a/django/core/management/commands/makemessages.py
+++ b/django/core/management/commands/makemessages.py
@@ -1,8 +1,10 @@
import re
import os
import sys
+import warnings
from itertools import dropwhile
from optparse import make_option
+
from django.core.management.base import CommandError, BaseCommand
try:
@@ -10,6 +12,10 @@ try:
except NameError:
from sets import Set as set # For Python 2.3
+# Intentionally silence DeprecationWarnings about os.popen3 in Python 2.6. It's
+# still sensible for us to use it, since subprocess didn't exist in 2.3.
+warnings.filterwarnings('ignore', category=DeprecationWarning, message=r'os\.popen3')
+
pythonize_re = re.compile(r'\n\s*//')
def handle_extensions(extensions=('html',)):