Removed six from InVesalius

Thiago Franco de Moraes
1 parent 2f686c76
Showing 6 changed files with 11 additions and 19 deletions Show diff stats
invesalius/data/geometry.py
invesalius/data/measures.py
invesalius/data/slice_.py
invesalius/data/styles.py
invesalius/project.py
invesalius/session.py
@@ -22,14 +22,13 @@ import math
 import numpy as np
 import vtk
-from six import with_metaclass
 from pubsub import pub as Publisher
 import invesalius.constants as const
 import invesalius.utils as utils
-class Box(with_metaclass(utils.Singleton, object)):
+class Box(metaclass=utils.Singleton):
     """
     This class is a data structure for storing the
     coordinates (min and max) of box used in crop-mask.
 # -*- coding: UTF-8 -*-
-from six import with_metaclass
-
 import math
 import random
 import sys
@@ -57,7 +55,7 @@ else:
 DEBUG_DENSITY = False
-class MeasureData(with_metaclass(utils.Singleton)):
+class MeasureData(metaclass=utils.Singleton):
     """
     Responsible to keep measures data.
     """
@@ -22,7 +22,6 @@ import tempfile
 import numpy as np
 import vtk
 from scipy import ndimage
-from six import with_metaclass
 from pubsub import pub as Publisher
 import invesalius.constants as const
@@ -77,7 +76,7 @@ class SliceBuffer(object):
 # Only one slice will be initialized per time (despite several viewers
 # show it from distinct perspectives).
 # Therefore, we use Singleton design pattern for implementing it.
-class Slice(with_metaclass(utils.Singleton, object)):
+class Slice(metaclass=utils.Singleton):
     def __init__(self):
         self.current_mask = None
         self.blend_filter = None
@@ -30,7 +30,6 @@ import wx
 from scipy import ndimage
 from imageio import imsave
 from scipy.ndimage import generate_binary_structure, watershed_ift
-from six import with_metaclass
 from skimage.morphology import watershed
 from pubsub import pub as Publisher
@@ -1127,7 +1126,7 @@ class ChangeSliceInteractorStyle(DefaultInteractorStyle):
         self.last_position = position[1]
-class EditorConfig(with_metaclass(utils.Singleton, object)):
+class EditorConfig(metaclass=utils.Singleton):
     def __init__(self):
         self.operation = const.BRUSH_THRESH
         self.cursor_type = const.BRUSH_CIRCLE
@@ -1394,7 +1393,7 @@ class WatershedProgressWindow(object):
         self.dlg.Destroy()
-class WatershedConfig(with_metaclass(utils.Singleton, object)):
+class WatershedConfig(metaclass=utils.Singleton):
     def __init__(self):
         self.algorithm = "Watershed"
         self.con_2d = 4
@@ -2174,7 +2173,7 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
             buffer_.discard_image()
-class FFillConfig(with_metaclass(utils.Singleton, object)):
+class FFillConfig(metaclass=utils.Singleton):
     def __init__(self):
         self.dlg_visible = False
         self.target = "2D"
@@ -2310,7 +2309,7 @@ class RemoveMaskPartsInteractorStyle(FloodFillMaskInteractorStyle):
         self._progr_title = _(u"Remove part")
         self._progr_msg = _(u"Removing part ...")
-class CropMaskConfig(with_metaclass(utils.Singleton, object)):
+class CropMaskConfig(metaclass=utils.Singleton):
     def __init__(self):
         self.dlg_visible = False
@@ -2411,7 +2410,7 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
             Publisher.sendMessage('Reload actual slice')
-class SelectPartConfig(with_metaclass(utils.Singleton, object)):
+class SelectPartConfig(metaclass=utils.Singleton):
     def __init__(self):
         self.mask = None
         self.con_3d = 6
@@ -2517,7 +2516,7 @@ class SelectMaskPartsInteractorStyle(DefaultInteractorStyle):
         self.config.mask = mask
-class FFillSegmentationConfig(with_metaclass(utils.Singleton, object)):
+class FFillSegmentationConfig(metaclass=utils.Singleton):
     def __init__(self):
         self.dlg_visible = False
         self.target = "2D"
@@ -29,7 +29,6 @@ import tempfile
 import numpy as np
 import vtk
 import wx
-from six import with_metaclass
 from pubsub import pub as Publisher
@@ -52,7 +51,7 @@ else:
 # Only one project will be initialized per time. Therefore, we use
 # Singleton design pattern for implementing it
-class Project(with_metaclass(Singleton, object)):
+class Project(metaclass=Singleton):
     def __init__(self):
         # Patient/ acquistion information
         self.name = ''
@@ -17,8 +17,6 @@
 #    detalhes.
 #--------------------------------------------------------------------------
-from six import with_metaclass
-
 try:
     import configparser as ConfigParser
 except(ImportError):
@@ -51,7 +49,7 @@ SESSION_ENCODING = &#39;utf8&#39;
 # Only one session will be initialized per time. Therefore, we use
 # Singleton design pattern for implementing it
-class Session(with_metaclass(Singleton, object)):
+class Session(metaclass=Singleton):
     def __init__(self):
         self.project_path = ()
1	# -- coding: UTF-8 --	1	# -- coding: UTF-8 --
2		2
3	-from six import with_metaclass
4	-
5	import math	3	import math
6	import random	4	import random
7	import sys	5	import sys
	@@ -57,7 +55,7 @@ else:		@@ -57,7 +55,7 @@ else:
57		55
58	DEBUG_DENSITY = False	56	DEBUG_DENSITY = False
59		57
60	-class MeasureData(with_metaclass(utils.Singleton)):	58	+class MeasureData(metaclass=utils.Singleton):
61	"""	59	"""
62	Responsible to keep measures data.	60	Responsible to keep measures data.
63	"""	61	"""
	@@ -29,7 +29,6 @@ import tempfile		@@ -29,7 +29,6 @@ import tempfile
29	import numpy as np	29	import numpy as np
30	import vtk	30	import vtk
31	import wx	31	import wx
32	-from six import with_metaclass
33		32
34	from pubsub import pub as Publisher	33	from pubsub import pub as Publisher
35		34
	@@ -52,7 +51,7 @@ else:		@@ -52,7 +51,7 @@ else:
52		51
53	# Only one project will be initialized per time. Therefore, we use	52	# Only one project will be initialized per time. Therefore, we use
54	# Singleton design pattern for implementing it	53	# Singleton design pattern for implementing it
55	-class Project(with_metaclass(Singleton, object)):	54	+class Project(metaclass=Singleton):
56	def __init__(self):	55	def __init__(self):
57	# Patient/ acquistion information	56	# Patient/ acquistion information
58	self.name = ''	57	self.name = ''