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

Use Django's NamedTemporaryFile which is able to be reopened. Closes #91 and #97.

Browse Source
This commit is contained in:
Jannis Leidel
2011-08-19 17:43:42 +02:00
parent abf9895007
commit b6f47fb23b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compressor/filters/base.py
View File

@@ -4,6 +4,7 @@ import logging
import subprocess import subprocess
import tempfile import tempfile
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core.files.temp import NamedTemporaryFile
from django.utils.importlib import import_module from django.utils.importlib import import_module
from compressor.conf import settings from compressor.conf import settings
@@ -98,7 +99,7 @@ class CompilerFilter(FilterBase):
if self.infile is None: if self.infile is None:
if "{infile}" in self.command: if "{infile}" in self.command:
if self.filename is None: if self.filename is None:
self.infile = tempfile.NamedTemporaryFile(mode="w") self.infile = NamedTemporaryFile(mode="w")
self.infile.write(self.content) self.infile.write(self.content)
self.infile.flush() self.infile.flush()
os.fsync(self.infile) os.fsync(self.infile)
@@ -108,8 +109,8 @@ class CompilerFilter(FilterBase):
options["infile"] = self.filename options["infile"] = self.filename
if "{outfile}" in self.command and not "outfile" in options: if "{outfile}" in self.command and not "outfile" in options:
ext = ".%s" % self.type and self.type or "" ext = self.type and ".%s" % self.type or ""
self.outfile = tempfile.NamedTemporaryFile(mode='r+', suffix=ext) self.outfile = NamedTemporaryFile(mode='r+', suffix=ext)
options["outfile"] = self.outfile.name options["outfile"] = self.outfile.name
try: try:
command = fstr(self.command).format(**options) command = fstr(self.command).format(**options)