summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Th?nault <sylvain.thenault@logilab.fr>2013-04-29 15:59:45 +0200
committerSylvain Th?nault <sylvain.thenault@logilab.fr>2013-04-29 15:59:45 +0200
commit4177db3d468dec0d363071f16e52da25b52be95b (patch)
tree827ecb80d66cea51960bde05f9e03c36d01476bf
parent5a8aab5d447343480b28ee760bce44f03f30f3d5 (diff)
downloadlogilab-common-4177db3d468dec0d363071f16e52da25b52be95b.tar.gz
[modutils] fix typo causing name error in python3 / bad message in python2. Closes #136037
-rw-r--r--ChangeLog5
-rw-r--r--modutils.py4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e8337e..8ee6eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
ChangeLog for logilab.common
============================
+--
+ * modutils: fix typo causing name error in python3 / bad message in python2
+ (#136037)
+
+
2013-04-16 -- 0.59.1
* graph: added pruning of the recursive search tree for detecting cycles in
graphs (closes #2469)
diff --git a/modutils.py b/modutils.py
index 2cae005..c792847 100644
--- a/modutils.py
+++ b/modutils.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of logilab-common.
@@ -570,7 +570,7 @@ def _search_zip(modpath, pic):
if importer.find_module(modpath[0]):
if not importer.find_module('/'.join(modpath)):
raise ImportError('No module named %s in %s/%s' % (
- '.'.join(modpath[1:]), file, modpath))
+ '.'.join(modpath[1:]), filepath, modpath))
return ZIPFILE, abspath(filepath) + '/' + '/'.join(modpath), filepath
raise ImportError('No module named %s' % '.'.join(modpath))