From 4bb7be7cf68b51af38b985bae7c1a13390d22aeb Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Sat, 3 Dec 2011 14:30:42 -0800
Subject: [PATCH] BUG: Python 3 fixes.

---
 skimage/__init__.py | 10 ++++++++--
 skimage/_build.py   |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/skimage/__init__.py b/skimage/__init__.py
index 420d8e26..4f543ad8 100644
--- a/skimage/__init__.py
+++ b/skimage/__init__.py
@@ -28,11 +28,17 @@ def _setup_test(verbose=False):
 
 test = _setup_test()
 if test is None:
-    del test
+    try:
+        del test
+    except NameError:
+        pass
 
 test_verbose = _setup_test(verbose=True)
 if test_verbose is None:
-    del test
+    try:
+        del test
+    except NameError:
+        pass
 
 def get_log(name):
     """Return a console logger.
diff --git a/skimage/_build.py b/skimage/_build.py
index 7198f7d5..b30f7596 100644
--- a/skimage/_build.py
+++ b/skimage/_build.py
@@ -63,7 +63,7 @@ def _changed(filename):
 
     """
     filename_cache = filename + '.md5'
-    
+
     try:
         md5_cached = open(filename_cache, 'rb').read()
     except IOError:
@@ -73,6 +73,6 @@ def _changed(filename):
         md5_new = _md5sum(f)
 
         with open(filename_cache, 'wb') as cf:
-            cf.write(md5_new)
+            cf.write(md5_new.encode('utf-8'))
 
     return md5_cached != md5_new