aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/media_types
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-03-19 16:44:34 +0200
committerBerker Peksag <berker.peksag@gmail.com>2014-05-08 20:33:14 +0300
commit7f342c72f64594775bac1bcce81b32ae9e18e6ac (patch)
tree4e4c1e7657bdb3d7d83b23c60143632e5a02945e /mediagoblin/media_types
parent74e77c36888b9fbec7e4f8f2b0f1d0e0487ed6b4 (diff)
downloadmediagoblin-7f342c72f64594775bac1bcce81b32ae9e18e6ac.tar.lz
mediagoblin-7f342c72f64594775bac1bcce81b32ae9e18e6ac.tar.xz
mediagoblin-7f342c72f64594775bac1bcce81b32ae9e18e6ac.zip
Continue to port GMG codebase.
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r--mediagoblin/media_types/image/processing.py5
-rw-r--r--mediagoblin/media_types/pdf/processing.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index 1db82ee7..a9b966ff 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -14,6 +14,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import print_function
+
try:
from PIL import Image
except ImportError:
@@ -381,5 +383,4 @@ if __name__ == '__main__':
clean = clean_exif(result)
useful = get_useful(clean)
- print pp.pprint(
- clean)
+ print(pp.pprint(clean))
diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py
index a000007a..0a173cf7 100644
--- a/mediagoblin/media_types/pdf/processing.py
+++ b/mediagoblin/media_types/pdf/processing.py
@@ -138,7 +138,7 @@ def is_unoconv_working():
try:
proc = Popen([unoconv, '--show'], stderr=PIPE)
output = proc.stderr.read()
- except OSError, e:
+ except OSError:
_log.warn(_('unoconv failing to run, check log file'))
return False
if 'ERROR' in output: