Merge pull request #19 from ospalh/some-fixes

Some fixes

anki/importing/anki2.py

@@ -301,7 +301,7 @@ insert or ignore into revlog values (?,?,?,?,?,?,?,?,?)""", revlog)
         path = os.path.join(dir, fname)
         try:
             return open(path, "rb").read()
-        except IOError, OSError:
+        except (IOError, OSError):
             return
 
     def _srcMediaData(self, fname):

anki/media.py

@@ -3,7 +3,7 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import os, shutil, re, urllib, urllib2, time, unicodedata, \
-    urllib, sys, zipfile
+    sys, zipfile
 from cStringIO import StringIO
 from anki.utils import checksum, intTime, namedtmp, isWin, isMac, json
 from anki.lang import _

anki/sound.py

@@ -3,7 +3,7 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import re, sys, threading, time, subprocess, os, signal, errno, atexit
-import shutil, random, atexit
+import shutil, random
 from anki.hooks import addHook, runHook
 from anki.utils import namedtmp, tmpdir, isWin, isMac
 

anki/upgrade.py

@@ -494,13 +494,8 @@ order by ordinal""", mid)):
                             t[k] = t[k].replace(
                                 "{{Reading}}", "{{furigana:Reading}}")
                 # adjust css
-                if t['bg'].lower() == "#ffffff":
-                    # a bit more intuitive default
-                    bg = "white"
-                else:
-                    bg = t['bg']
                 css = ""
-                if t['bg'] != "white":
+                if t['bg'] != "white" and t['bg'].lower() != "#ffffff":
                     css = "background-color: %s;" % t['bg']
                 if t['align']:
                     css += "text-align: %s" % ("left", "right")[t['align']-1]