py2-py3 data exchange bugfix (2)

tramway/core/scaler.py

@@ -89,17 +89,12 @@ def scaled(self, points, asarray=False):
 				cols = columns(points)
 				coltype = type(cols[0])
 				if type(self.columns[0]) is not coltype:
-					if coltype is str:
-						if coltype is bytes:
-							coerce = lambda s: s.encode('utf-8')
-						else:
-							coerce = lambda s: s.decode('utf-8')
-					elif coltype is bytes:
-						coerce = lambda s: s.decode('utf-8')
-					else:
+					if coltype is bytes:
 						coerce = lambda s: s.encode('utf-8')
-				self.columns = [ coerce(c) for c in self.columns ]
-				self.euclidean = [ coerce(c) for c in self.euclidean ]
+					else:
+						coerce = lambda s: s.decode('utf-8')
+					self.columns = [ coerce(c) for c in self.columns ]
+					self.euclidean = [ coerce(c) for c in self.euclidean ]
 				points = points[self.columns]
 			else:
 				if self.center is not None and isstructured(self.center):