From 7b0f100fc3c988438702eba132510139cd399732 Mon Sep 17 00:00:00 2001 From: Ravin Kumar Date: Fri, 22 Jun 2018 12:22:27 +0530 Subject: [PATCH 1/3] Solved pyassimp.errors.AssimpError in conda This error occurred because of error in finding .extension files. os.path.splitext(filename)[-1].lower() not in ext_whitelist: ### this line had bugs, failed to select files with extensions .so.x [.so.1 .so.2 .so.3.1] but worked on simple extensions only. like- .so .dll Added a mechanism to remove this bug. --- port/PyAssimp/pyassimp/helper.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py index 7d9282745..4082a4b76 100644 --- a/port/PyAssimp/pyassimp/helper.py +++ b/port/PyAssimp/pyassimp/helper.py @@ -27,7 +27,7 @@ additional_dirs, ext_whitelist = [],[] if os.name=='posix': additional_dirs.append('./') additional_dirs.append('/usr/lib/') - additional_dirs.append('/usr/lib/x86_64-linux-gnu') + additional_dirs.append('/usr/lib/x86_64-linux-gnu/') additional_dirs.append('/usr/local/lib/') if 'LD_LIBRARY_PATH' in os.environ: @@ -223,10 +223,25 @@ def search_library(): # our minimum requirement for candidates is that # they should contain 'assimp' somewhere in # their name - if filename.lower().find('assimp')==-1 or\ - os.path.splitext(filename)[-1].lower() not in ext_whitelist: + + + #if filename.lower().find('assimp')==-1 or\ + # os.path.splitext(filename)[-1].lower() not in ext_whitelist: ### this line had bugs, failed to select files with extensions .so.x [.so.1 .so.2 .so.3.1] + # continue ### worked on simple extensions only. like- .so .dll + + + ##### Modified Code --- to correctly select extension files ##### + if filename.lower().find('assimp')==-1 : continue - + is_out=1 + for et in ext_whitelist: + if et in filename.lower(): + is_out=0 + break + if is_out: + continue + ##### Modified Code --- to correctly select extension files ##### + library_path = os.path.join(curfolder, filename) logger.debug('Try ' + library_path) try: From 4a720511e4afe8f61023ceefe406dee702073957 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 22 Jun 2018 16:13:46 +0200 Subject: [PATCH 2/3] Update helper.py Remove dead code. --- port/PyAssimp/pyassimp/helper.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py index 4082a4b76..e0ee0ccbf 100644 --- a/port/PyAssimp/pyassimp/helper.py +++ b/port/PyAssimp/pyassimp/helper.py @@ -222,15 +222,7 @@ def search_library(): for filename in os.listdir(curfolder): # our minimum requirement for candidates is that # they should contain 'assimp' somewhere in - # their name - - - #if filename.lower().find('assimp')==-1 or\ - # os.path.splitext(filename)[-1].lower() not in ext_whitelist: ### this line had bugs, failed to select files with extensions .so.x [.so.1 .so.2 .so.3.1] - # continue ### worked on simple extensions only. like- .so .dll - - - ##### Modified Code --- to correctly select extension files ##### + # their name if filename.lower().find('assimp')==-1 : continue is_out=1 From d4c7eb3b676fc6455a085444fcaf193edff0a777 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 22 Jun 2018 16:14:20 +0200 Subject: [PATCH 3/3] Update helper.py Remove deprecated comment. --- port/PyAssimp/pyassimp/helper.py | 1 - 1 file changed, 1 deletion(-) diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py index e0ee0ccbf..f9163de2a 100644 --- a/port/PyAssimp/pyassimp/helper.py +++ b/port/PyAssimp/pyassimp/helper.py @@ -232,7 +232,6 @@ def search_library(): break if is_out: continue - ##### Modified Code --- to correctly select extension files ##### library_path = os.path.join(curfolder, filename) logger.debug('Try ' + library_path)