summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-05 11:39:58 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-10-05 11:39:58 +0000
commit2f188334d359c444d7f134fbde3751f75b212cf9 (patch)
treee2e962dbd64b2a2cc11586f0fc2a5de39883a198
parent806ea3a1dede8d51df11c2bd9c2f23be95ea6e00 (diff)
Fixed #9283 -- Deliberately silence one deprecation warning raised by python 2.6.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9148 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 55cd3bac57..598f6ff019 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',)):