Backport mmap fix to master. Version 3.3.

rsmith-nl · May 17, 2016 · f1b48bc · f1b48bc
1 parent 0dcbff3
commit f1b48bc
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     _scripts = outnames
 
 setup(name='stltools',
-      version='$Revision$'[11:-2],
+      version='3.3',
       license='BSD',
       description='Programs to read and convert STL files.',
       author='Roland Smith', author_email='rsmith@xs4all.nl',

diff --git a/stl2pdf.py b/stl2pdf.py
@@ -33,7 +33,7 @@
 import numpy as np
 from stltools import stl, bbox, utils, vecops, matrix
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def usage():

diff --git a/stl2pov.py b/stl2pov.py
@@ -32,7 +32,7 @@
 import time
 from stltools import stl, utils
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def mesh1(name, vertices):

diff --git a/stl2ps.py b/stl2ps.py
@@ -33,7 +33,7 @@
 import numpy as np
 from stltools import stl, bbox, utils, vecops, matrix
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def usage():

diff --git a/stlinfo.py b/stlinfo.py
@@ -33,7 +33,7 @@
 import time
 from stltools import stl, bbox, utils
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def main(argv):

diff --git a/stltools/bbox.py b/stltools/bbox.py
@@ -31,7 +31,7 @@
 
 import numpy as np
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def makebb(pnts):

diff --git a/stltools/matrix.py b/stltools/matrix.py
@@ -33,7 +33,7 @@
 import math
 import numpy as np
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def I():

diff --git a/stltools/stl.py b/stltools/stl.py
@@ -35,7 +35,7 @@
 import vecops as vo
 import numpy as np
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def _striplines(m):
@@ -119,7 +119,7 @@ def readstl(name):
     of the facets, and the name of the object as given in the STL file.
     """
     with open(name, 'rb') as f:
-        mm = mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ)
+        mm = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
         vertices, name = _parsebinary(mm)
         if vertices is None:
             mm.seek(0)

diff --git a/stltools/utils.py b/stltools/utils.py
@@ -36,7 +36,7 @@
 import sys
 import matrix as m
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def outname(inname, extension, addenum=''):

diff --git a/stltools/vecops.py b/stltools/vecops.py
@@ -32,7 +32,7 @@
 import numpy as np
 import math as m
 
-__version__ = '$Revision$'[11:-2]
+__version__ = '3.3'
 
 
 def length(v):