Cleaning code.

ecolyzer/system/file.py

@@ -55,22 +55,7 @@ def fullpath(self, fullpath):
 		if fullpath == None:
 			return 
 		self._fullpath = None	
-		path, file_with_ext = os.path.split(fullpath)
-		filename = ''
-		ext = ''
-		if '.' in file_with_ext:
-			split_list = file_with_ext.split('.')
-			if len(split_list) > 2:
-				ext = split_list.pop()
-				filename = '.'.join(split_list)
-			else:
-				if file_with_ext.startswith('.'):
-					filename = '.' + split_list[1]
-				else:
-					filename = split_list[0]
-					ext = split_list[1]
-		else:
-			filename = file_with_ext		
+		path, filename, ext = File.Split(fullpath)		
 		self.path = path
 		self.name = filename
 		self.ext = ext	
@@ -99,7 +84,6 @@ def Extension(fullpath):
 			else:
 				if not file_with_ext.startswith('.'):
 					ext = split_list[1]
-
 		return ext
 
 	@staticmethod

tests/unit/file_test.py

@@ -64,3 +64,13 @@ def test_without_ext():
 
 	file2 = File('noextfile')
 	assert file2.fullpath == 'noextfile'
+
+def test_extension():
+	assert File.Extension('some/path/file.ext') == 'ext'
+	assert File.Extension('file') == ''
+
+def test_split():
+	path, name, ext = File.Split('some/path/file.ext')
+	assert path == 'some/path'
+	assert name == 'file'
+	assert ext == 'ext'