python 3 compatibility (#111)

* python 3 compatibility

* Add python3 test to Travis configuration

Author: ndem0

.travis.yml

@@ -13,6 +13,12 @@ matrix:
         - os: osx
           language: generic
           env: TOXENV=py27
+        - os: linux
+          python: 3.5
+          env: TOXENV=py35
+        - os: osx
+          language: generic
+          env: TOXENV=py35
 
 before_script:
     - "export DISPLAY=:99.0"
@@ -39,6 +45,7 @@ before_install:
     - conda update -q conda
     # Useful for debugging any issues with conda
     - conda info -a
+    - conda config --add channels conda-forge
 
 install:
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
@@ -47,7 +54,7 @@ install:
         conda create --yes -n test python="2.7";
       fi
     - source activate test
-    - conda install --yes numpy scipy matplotlib pip nose vtk sip=4.18
+    - conda install --yes numpy scipy matplotlib vtk pip nose sip=4.18
     - conda install --yes -c https://conda.anaconda.org/dlr-sc pythonocc-core==0.17
     - pip install setuptools
     - pip install enum34

pygem/affine.py

@@ -4,6 +4,7 @@
 import math
 import sys
 import numpy as np
+from functools import reduce
 
 
 def angles2matrix(rot_z=0, rot_y=0, rot_x=0):

pygem/filehandler.py

@@ -60,7 +60,7 @@ def _check_filename_type(filename):
 
 		:param string filename: file to check.
 		"""
-		if not isinstance(filename, basestring):
+		if not isinstance(filename, str):
 			raise TypeError(
 				'The given filename ({0!s}) must be a string'.format(filename)
 			)

pygem/nurbshandler.py

@@ -109,8 +109,8 @@ def parse(self, filename):
 
 			# cycle over the poles to get their coordinates
 			i = 0
-			for pole_u_direction in xrange(n_poles_u):
-				for pole_v_direction in xrange(n_poles_v):
+			for pole_u_direction in range(n_poles_u):
+				for pole_v_direction in range(n_poles_v):
 					control_point_coordinates = occ_face.Pole(\
 						pole_u_direction + 1, pole_v_direction + 1)
 					control_polygon_coordinates[i, :] = [control_point_coordinates.X(),\
@@ -172,8 +172,8 @@ def write(self, mesh_points, filename, tolerance=None):
 			n_poles_v = occ_face.NbVPoles()
 
 			i = 0
-			for pole_u_direction in xrange(n_poles_u):
-				for pole_v_direction in xrange(n_poles_v):
+			for pole_u_direction in range(n_poles_u):
+				for pole_v_direction in range(n_poles_v):
 					control_point_coordinates = mesh_points[i + control_point_position[n_faces], :]
 					point_xyz = gp_XYZ(*control_point_coordinates)
 

pygem/params.py

@@ -1,7 +1,10 @@
 """
 Utilities for reading and writing parameters files to perform the desired geometrical morphing.
 """
-import ConfigParser
+try:
+    import configparser as configparser
+except ImportError:
+    import ConfigParser as configparser
 import os
 
 import numpy as np
@@ -123,15 +126,15 @@ def read_parameters(self, filename='parameters.prm'):
 
 		:param string filename: parameters file to be read in.
 		"""
-		if not isinstance(filename, basestring):
+		if not isinstance(filename, str):
 			raise TypeError("filename must be a string")
 
 		# Checks if the parameters file exists. If not it writes the default class into filename.
 		if not os.path.isfile(filename):
 			self.write_parameters(filename)
 			return
 
-		config = ConfigParser.RawConfigParser()
+		config = configparser.RawConfigParser()
 		config.read(filename)
 
 		self.n_control_points[0] = config.getint('Box info', 'n control points x')
@@ -197,7 +200,7 @@ def write_parameters(self, filename='parameters.prm'):
 
 		:param string filename: parameters file to be written out.
 		"""
-		if not isinstance(filename, basestring):
+		if not isinstance(filename, str):
 			raise TypeError("filename must be a string")
 
 		with open(filename, 'w') as output_file:
@@ -280,33 +283,33 @@ def print_info(self):
 		"""
 		This method prints all the FFD parameters on the screen. Its purpose is for debugging.
 		"""
-		print 'conversion_unit = ' + str(self.conversion_unit) + '\n'
-		print '(lenght_box_x, lenght_box_y, lenght_box_z) = (' + str(self.lenght_box_x) + \
-			', ' + str(self.lenght_box_y) + ', ' + str(self.lenght_box_z) + ')'
-		print 'origin_box = ' + str(self.origin_box)
-		print 'n_control_points = ' + str(self.n_control_points)
-		print '(rot_angle_x, rot_angle_y, rot_angle_z) = (' + str(self.rot_angle_x) + \
-			', ' + str(self.rot_angle_y) + ', ' + str(self.rot_angle_z) + ')'
-		print '\narray_mu_x ='
-		print self.array_mu_x
-		print '\narray_mu_y ='
-		print self.array_mu_y
-		print '\narray_mu_z ='
-		print self.array_mu_z
-		print '\npsi_mapping ='
-		print self.psi_mapping
-		print '\ninv_psi_mapping ='
-		print self.inv_psi_mapping
-		print '\nrotation_matrix ='
-		print self.rotation_matrix
-		print '\nposition_vertex_0 ='
-		print self.position_vertex_0
-		print '\nposition_vertex_1 ='
-		print self.position_vertex_1
-		print '\nposition_vertex_2 ='
-		print self.position_vertex_2
-		print '\nposition_vertex_3 ='
-		print self.position_vertex_3
+		print('conversion_unit = ' + str(self.conversion_unit) + '\n')
+		print('(lenght_box_x, lenght_box_y, lenght_box_z) = (' + str(self.lenght_box_x) + \
+			', ' + str(self.lenght_box_y) + ', ' + str(self.lenght_box_z) + ')')
+		print('origin_box = ' + str(self.origin_box))
+		print('n_control_points = ' + str(self.n_control_points))
+		print('(rot_angle_x, rot_angle_y, rot_angle_z) = (' + str(self.rot_angle_x) + \
+			', ' + str(self.rot_angle_y) + ', ' + str(self.rot_angle_z) + ')')
+		print('\narray_mu_x =')
+		print(self.array_mu_x)
+		print('\narray_mu_y =')
+		print(self.array_mu_y)
+		print('\narray_mu_z =')
+		print(self.array_mu_z)
+		print('\npsi_mapping =')
+		print(self.psi_mapping)
+		print('\ninv_psi_mapping =')
+		print(self.inv_psi_mapping)
+		print('\nrotation_matrix =')
+		print(self.rotation_matrix)
+		print('\nposition_vertex_0 =')
+		print(self.position_vertex_0)
+		print('\nposition_vertex_1 =')
+		print(self.position_vertex_1)
+		print('\nposition_vertex_2 =')
+		print(self.position_vertex_2)
+		print('\nposition_vertex_3 =')
+		print(self.position_vertex_3)
 
 	def build_bounding_box(self, shape, tol=1e-6, triangulate=False, triangulate_tol=1e-1):
 		"""
@@ -442,7 +445,7 @@ def read_parameters(self, filename='parameters_rbf.prm'):
 
 		:param string filename: parameters file to be read in. Default value is parameters_rbf.prm.
 		"""
-		if not isinstance(filename, basestring):
+		if not isinstance(filename, str):
 			raise TypeError('filename must be a string')
 
 		# Checks if the parameters file exists. If not it writes the default class into filename.
@@ -459,7 +462,7 @@ def read_parameters(self, filename='parameters_rbf.prm'):
 			self.write_parameters(filename)
 			return
 
-		config = ConfigParser.RawConfigParser()
+		config = configparser.RawConfigParser()
 		config.read(filename)
 
 		self.basis = config.get('Radial Basis Functions', 'basis function')
@@ -469,7 +472,7 @@ def read_parameters(self, filename='parameters_rbf.prm'):
 		lines = ctrl_points.split('\n')
 		self.n_control_points = len(lines)
 		self.original_control_points = np.zeros((self.n_control_points, 3))
-		for line, i in zip(lines, range(0, self.n_control_points)):
+		for line, i in zip(lines, list(range(0, self.n_control_points))):
 			values = line.split()
 			self.original_control_points[i] = np.array([float(values[0]), float(values[1]), float(values[2])])
 
@@ -481,7 +484,7 @@ def read_parameters(self, filename='parameters_rbf.prm'):
 				" and in the 'deformed control points' section of the parameters file ({0!s})".format(filename))
 
 		self.deformed_control_points = np.zeros((self.n_control_points, 3))
-		for line, i in zip(lines, range(0, self.n_control_points)):
+		for line, i in zip(lines, list(range(0, self.n_control_points))):
 			values = line.split()
 			self.deformed_control_points[i] = np.array([float(values[0]), float(values[1]), float(values[2])])
 
@@ -493,7 +496,7 @@ def write_parameters(self, filename='parameters_rbf.prm'):
 
 		:param string filename: parameters file to be written out.
 		"""
-		if not isinstance(filename, basestring):
+		if not isinstance(filename, str):
 			raise TypeError("filename must be a string")
 
 		with open(filename, 'w') as output_file:
@@ -540,10 +543,10 @@ def print_info(self):
 		"""
 		This method prints all the RBF parameters on the screen. Its purpose is for debugging.
 		"""
-		print 'basis function = ' + str(self.basis)
-		print 'radius = ' + str(self.radius)
-		print 'n_control_points = ' + str(self.n_control_points)
-		print '\noriginal_control_points ='
-		print self.original_control_points
-		print '\ndeformed_control_points ='
-		print self.deformed_control_points
+		print('basis function = ' + str(self.basis))
+		print('radius = ' + str(self.radius))
+		print('n_control_points = ' + str(self.n_control_points))
+		print('\noriginal_control_points =')
+		print(self.original_control_points)
+		print('\ndeformed_control_points =')
+		print(self.deformed_control_points)

pygem/stlhandler.py

@@ -68,7 +68,7 @@ def write(self, mesh_points, filename, write_bin=False):
 
 		n_vertices = mesh_points.shape[0]
 		# number of triplets of vertices
-		n_triplets = n_vertices / 3
+		n_triplets = n_vertices // 3
 		data = np.zeros(n_triplets, dtype=mesh.Mesh.dtype)
 		stl_mesh = mesh.Mesh(data, remove_empty_areas=False)