openstack/deb-python-django-compressor
Code Issues Proposed changes

Merge pull request #561 from thenewguy/quote_on_windows

Browse Source 
shlex.quote/pipes.quote is not compatible with Windows
This commit is contained in:
Jannis Leidel
2014-12-30 13:49:33 +01:00
parent 099935a0f6 6d5f6e04f2
commit 1c0a5251c1
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compressor/filters/base.py
View File

@@ -3,10 +3,18 @@ import io
import logging import logging
import subprocess import subprocess
try: from platform import system
if system() != "Windows":
try:
from shlex import quote as shell_quote # Python 3 from shlex import quote as shell_quote # Python 3
except ImportError: except ImportError:
from pipes import quote as shell_quote # Python 2 from pipes import quote as shell_quote # Python 2
else:
from subprocess import list2cmdline
def shell_quote(s):
# shlex.quote/pipes.quote is not compatible with Windows
return list2cmdline([s])
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core.files.temp import NamedTemporaryFile from django.core.files.temp import NamedTemporaryFile