diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index edad5fe1f9..6a399ab145 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -438,7 +438,7 @@ class MobiReader(object):
             tag.attrib.pop('xmlns', '')
             if tag.tag in ('country-region', 'place', 'placetype', 'placename',
                 'state', 'city', 'street', 'address', 'content'):
-            tag.tag = 'div' if tag.tag == 'content' else 'span'
+                tag.tag = 'div' if tag.tag == 'content' else 'span'
                 for key in tag.attrib.keys():
                     tag.attrib.pop(key)
                 continue
@@ -527,7 +527,7 @@ class MobiReader(object):
             opf.cover = 'images/%05d.jpg' % 1
             if not os.path.exists(os.path.join(os.path.dirname(htmlfile),
                 * opf.cover.split('/'))):
-            opf.cover = None
+                opf.cover = None
 
         manifest = [(htmlfile, 'text/x-oeb1-document'),
             (os.path.abspath('styles.css'), 'text/css')]
diff --git a/src/calibre/ebooks/pdf/input.py b/src/calibre/ebooks/pdf/input.py
index e8c3889e41..6aa695c912 100644
--- a/src/calibre/ebooks/pdf/input.py
+++ b/src/calibre/ebooks/pdf/input.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 
 __license__ = 'GPL 3'
 __copyright__ = '2009, John Schember <john@nachtimwald.com>'
@@ -12,7 +11,7 @@ from calibre.ebooks.pdf.pdftohtml import pdftohtml
 from calibre.ebooks.metadata.opf2 import OPFCreator
 
 class PDFInput(InputFormatPlugin):
-    
+
     name        = 'PDF Input'
     author      = 'John Schember'
     description = 'Convert PDF files to HTML'
@@ -21,10 +20,10 @@ class PDFInput(InputFormatPlugin):
     def convert(self, stream, options, file_ext, log,
                 accelerators):
         html = pdftohtml(stream.name)
-        
+
         with open('index.html', 'wb') as index:
             index.write(html)
-            
+
         from calibre.ebooks.metadata.meta import get_metadata
         mi = get_metadata(stream, 'pdf')
         opf = OPFCreator(os.getcwd(), mi)
@@ -32,5 +31,5 @@ class PDFInput(InputFormatPlugin):
         opf.create_spine(['index.html'])
         with open('metadata.opf', 'wb') as opffile:
             opf.render(opffile)
-        
+
         return os.path.join(os.getcwd(), 'metadata.opf')
diff --git a/src/calibre/ebooks/pdf/pdftohtml.py b/src/calibre/ebooks/pdf/pdftohtml.py
index 2c0daf05ca..c88b50e82e 100644
--- a/src/calibre/ebooks/pdf/pdftohtml.py
+++ b/src/calibre/ebooks/pdf/pdftohtml.py
@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 
 __license__ = 'GPL 3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>, ' \
                 '2009, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-import errno, os, sys, subprocess
+import errno
+import os
+import sys
+import subprocess
 from functools import partial
 
 from calibre.ebooks import ConversionError, DRMError