[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2340] trunk/py/scripts/addons: fix for image export on 3ds files, dont overwrite builtin 'map' for stl io

[Campbell Barton]

Revision: 2340
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2340
Author:   campbellbarton
Date:     2011-09-21 08:53:49 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
fix for image export on 3ds files, dont overwrite builtin 'map' for stl io

Modified Paths:
--------------
    trunk/py/scripts/addons/io_mesh_stl/stl_utils.py
    trunk/py/scripts/addons/io_scene_3ds/export_3ds.py

Modified: trunk/py/scripts/addons/io_mesh_stl/stl_utils.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_stl/stl_utils.py	2011-09-20 10:36:30 UTC (rev 2339)
+++ trunk/py/scripts/addons/io_mesh_stl/stl_utils.py	2011-09-21 08:53:49 UTC (rev 2340)
@@ -49,9 +49,9 @@
     with open(filename, 'rb') as file:
         # check http://bugs.python.org/issue8046 to have mmap context
         # manager fixed in python
-        map = mmap.mmap(file.fileno(), 0, access=mmap.ACCESS_READ)
-        yield map
-        map.close()
+        mem_map = mmap.mmap(file.fileno(), 0, access=mmap.ACCESS_READ)
+        yield mem_map
+        mem_map.close()
 
 
 class ListDict(dict):

Modified: trunk/py/scripts/addons/io_scene_3ds/export_3ds.py
===================================================================
--- trunk/py/scripts/addons/io_scene_3ds/export_3ds.py	2011-09-20 10:36:30 UTC (rev 2339)
+++ trunk/py/scripts/addons/io_scene_3ds/export_3ds.py	2011-09-21 08:53:49 UTC (rev 2340)
@@ -446,7 +446,7 @@
     """
     mat_sub = _3ds_chunk(id)
 
-    def add_image(img):
+    def add_image(image):
         import bpy
         filename = bpy.path.basename(image.filepath)
         mat_sub_file = _3ds_chunk(MATMAPFILE)