From de22dbd9ead390cdea61489edb86630a3b587377 Mon Sep 17 00:00:00 2001
From: Laurent El Shafey <Laurent.El-Shafey@idiap.ch>
Date: Wed, 14 Aug 2013 11:15:45 +0200
Subject: [PATCH] [python3] add support
---
setup.py | 1 +
xbob/db/mnist/query.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index f6c5961..55c0e20 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ setup(
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
'Programming Language :: Python',
+ 'Programming Language :: Python :: 3',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Database :: Front-Ends',
],
diff --git a/xbob/db/mnist/query.py b/xbob/db/mnist/query.py
index 494c6aa..f29430d 100644
--- a/xbob/db/mnist/query.py
+++ b/xbob/db/mnist/query.py
@@ -52,9 +52,9 @@ class Database():
try:
if self.m_tmp_dir:
shutil.rmtree(self.m_tmp_dir) # delete directory
- except OSError, e:
+ except OSError as e:
if e.errno != 2: # code 2 - no such file or directory
- raise 'xbob.db.mnist: Error while erasing temporarily downloaded data files'
+ raise("xbob.db.mnist: Error while erasing temporarily downloaded data files")
def __db_is_installed__(self):
from pkg_resources import resource_filename
@@ -132,7 +132,7 @@ class Database():
# perform the checks
for parameter in parameters:
if parameter not in valid_parameters:
- raise ValueError, "Invalid %s '%s'. Valid values are %s, or lists/tuples of those" % (parameter_description, parameter, valid_parameters)
+ raise ValueError("Invalid %s '%s'. Valid values are %s, or lists/tuples of those" % (parameter_description, parameter, valid_parameters))
# check passed, now return the list/tuple of parameters
return parameters
--
GitLab