From 6873cd6b86f465a5faf153f6a400e719d01bcc96 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Thu, 28 Aug 2014 16:39:01 +0200
Subject: [PATCH] Fixed urllib for python 3.
---
.gitignore | 27 +++++++++++++++++----------
bob/example/faceverify/utils.py | 9 +++++++--
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5345d2f..653e7b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,22 @@
-*.swp
*~
+*.swp
*.pyc
-*.png
-*.pdf
+*.so
+*.dylib
+CMakeLists.txt
+bin
+eggs
+parts
.installed.cfg
.mr.developer.cfg
-eggs/
-develop-eggs/
-bob.example.faceverify.egg-info/
+*.egg-info
+develop-eggs
+sphinx
+dist
+.nfs*
+.gdb_history
+build
+*.egg
src/
-bin/
-dist/
-sphinx/
-Database/
+*.png
+*.pdf
diff --git a/bob/example/faceverify/utils.py b/bob/example/faceverify/utils.py
index 40fbaa9..441b8ee 100644
--- a/bob/example/faceverify/utils.py
+++ b/bob/example/faceverify/utils.py
@@ -41,14 +41,19 @@ def atnt_database_directory(atnt_user_directory = None):
os.mkdir(atnt_default_directory)
# setup
- import urllib2, tempfile
+ import sys, tempfile
+ if sys.version_info[0] <= 2:
+ import urllib2 as urllib
+ else:
+ import urllib.request as urllib
+
db_url = 'http://www.cl.cam.ac.uk/Research/DTG/attarchive/pub/data/att_faces.zip'
import logging
logger = logging.getLogger('bob')
logger.warn("Downloading the AT&T database from '%s' to '%s' ..." % (db_url, atnt_default_directory))
# download
- url = urllib2.urlopen(db_url)
+ url = urllib.urlopen(db_url)
local_zip_file = tempfile.mkstemp(prefix='atnt_db_', suffix='.zip')[1]
dfile = open(local_zip_file, 'w')
dfile.write(url.read())
--
GitLab