cosmetic changes only.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@42443 20353a03-c40f-0410-a6d1-a30d3c3de9de

cloudooo/handler/ooo/tests/testMimemapper.py

@@ -31,7 +31,8 @@ from cloudooo.handler.ooo.application.openoffice import openoffice
 from cloudooo.handler.ooo.mimemapper import MimeMapper
 from cloudoooTestCase import make_suite
 
-text_expected_tuple = (('doc', 'Microsoft Word 6.0'),
+text_expected_tuple = (
+    ('doc', 'Microsoft Word 6.0'),
     ('doc', 'Microsoft Word 95'),
     ('doc', 'Microsoft Word 97/2000/XP'),
     ('htm', 'HTML Document (OpenOffice.org Writer)'),
@@ -45,25 +46,29 @@ text_expected_tuple = (('doc', 'Microsoft Word 6.0'),
     ('sdw', 'StarWriter 4.0'),
     ('sdw', 'StarWriter 5.0'),
     ('sxw', 'OpenOffice.org 1.0 Text Document'),
-    ('txt', 'Text'),
     ('txt', 'Text Encoded'),
+    ('txt', 'Text'),
     ('xhtml', 'XHTML'),
-    (u'pdb', u'AportisDoc (Palm)'),
-    (u'psw', u'Pocket Word'))
+    ('pdb', 'AportisDoc (Palm)'),
+    ('psw', 'Pocket Word'),
+    )
 
-global_expected_tuple = (('sdw', 'StarWriter 3.0'),
+global_expected_tuple = (
+    ('htm', 'HTML (Writer/Global)'),
+    ('html', 'HTML (Writer/Global)'),
+    ('odm', 'ODF Master Document'),
+    ('odt', 'ODF Text Document'),
+    ('pdf', 'PDF - Portable Document Format'),
+    ('sdw', 'StarWriter 3.0'),
     ('sdw', 'StarWriter 4.0'),
     ('sdw', 'StarWriter 5.0'),
-    ('txt', 'Text Encoded (OpenOffice.org Master Document)'),
-    ('sxw', 'OpenOffice.org 1.0 Text Document'),
     ('sxg', 'OpenOffice.org 1.0 Master Document'),
-    ('pdf', 'PDF - Portable Document Format'),
-    ('odm', 'ODF Master Document'),
-    ('odt', 'ODF Text Document'),
-    ('html', 'HTML (Writer/Global)'),
-    ('htm', 'HTML (Writer/Global)'))
+    ('sxw', 'OpenOffice.org 1.0 Text Document'),
+    ('txt', 'Text Encoded (OpenOffice.org Master Document)'),
+    )
 
-drawing_expected_tuple = (('bmp', 'BMP - Windows Bitmap'), 
+drawing_expected_tuple = (
+    ('bmp', 'BMP - Windows Bitmap'),
     ('emf', 'EMF - Enhanced Metafile'),
     ('eps', 'EPS - Encapsulated PostScript'),
     ('gif', 'GIF - Graphics Interchange Format'),
@@ -94,20 +99,24 @@ drawing_expected_tuple = (('bmp', 'BMP - Windows Bitmap'),
     ('tif', 'TIFF - Tagged Image File Format'),
     ('tiff', 'TIFF - Tagged Image File Format'),
     ('wmf', 'WMF - Windows Metafile'),
-    ('xhtml', 'XHTML'), ('xpm', 'XPM - X PixMap'))
+    ('xhtml', 'XHTML'), ('xpm', 'XPM - X PixMap'),
+    )
 
-web_expected_tuple = (('html', 'HTML Document'),
+web_expected_tuple = (
     ('htm', 'HTML Document'),
-    ('txt', 'Text (OpenOffice.org Writer/Web)'), 
-    ('txt', 'Text Encoded (OpenOffice.org Writer/Web)'),
-    ('sxw', 'OpenOffice.org 1.0 Text Document (OpenOffice.org Writer/Web)'),
-    ('pdf', 'PDF - Portable Document Format'),
+    ('html', 'HTML Document'),
     ('odt', 'OpenOffice.org Text (OpenOffice.org Writer/Web)'),
+    ('pdf', 'PDF - Portable Document Format'),
     ('sdw', 'StarWriter 3.0 (OpenOffice.org Writer/Web)'),
     ('sdw', 'StarWriter 4.0 (OpenOffice.org Writer/Web)'),
-    ('sdw', 'StarWriter 5.0 (OpenOffice.org Writer/Web)'))
+    ('sdw', 'StarWriter 5.0 (OpenOffice.org Writer/Web)'),
+    ('sxw', 'OpenOffice.org 1.0 Text Document (OpenOffice.org Writer/Web)'),
+    ('txt', 'Text (OpenOffice.org Writer/Web)'),
+    ('txt', 'Text Encoded (OpenOffice.org Writer/Web)'),
+    )
 
-presentation_expected_tuple = (('bmp', 'BMP - Windows Bitmap'),
+presentation_expected_tuple = (
+    ('bmp', 'BMP - Windows Bitmap'),
     ('emf', 'EMF - Enhanced Metafile'),
     ('eps', 'EPS - Encapsulated PostScript'),
     ('gif', 'GIF - Graphics Interchange Format'),
@@ -145,9 +154,11 @@ presentation_expected_tuple = (('bmp', 'BMP - Windows Bitmap'),
     ('tiff', 'TIFF - Tagged Image File Format'),
     ('wmf', 'WMF - Windows Metafile'),
     ('xhtml', 'XHTML'),
-    ('xpm', 'XPM - X PixMap'))
+    ('xpm', 'XPM - X PixMap'),
+    )
 
-spreadsheet_expected_list = (('csv', 'Text CSV'), 
+spreadsheet_expected_list = (
+    ('csv', 'Text CSV'),
     ('htm', 'HTML Document (OpenOffice.org Calc)'),
     ('html', 'HTML Document (OpenOffice.org Calc)'),
     ('html', 'XHTML'),
@@ -179,21 +190,26 @@ spreadsheet_expected_list = (('csv', 'Text CSV'),
     ('xlw', 'Microsoft Excel 4.0'),
     ('xlw', 'Microsoft Excel 5.0'),
     ('xlw', 'Microsoft Excel 95'),
-    ('xlw', 'Microsoft Excel 97/2000/XP'))
+    ('xlw', 'Microsoft Excel 97/2000/XP'),
+    )
 
-math_expected_tuple = (('smf', 'StarMath 4.0'),
+math_expected_tuple = (
     ('mml', 'MathML 1.01'),
+    ('odf', 'ODF Formula'),
     ('pdf', 'PDF - Portable Document Format'),
+    ('smf', 'StarMath 3.0'),
+    ('smf', 'StarMath 4.0'),
     ('smf', 'StarMath 5.0'),
     ('sxm', 'OpenOffice.org 1.0 Formula'),
-    ('odf', 'ODF Formula'), 
-    ('smf', 'StarMath 3.0'))
+    )
 
-chart_expected_tuple = (('sds', 'StarChart 3.0'),
+chart_expected_tuple = (
+    ('odc', 'ODF Chart'),
+    ('sds', 'StarChart 3.0'),
     ('sds', 'StarChart 4.0'),
     ('sds', 'StarChart 5.0'),
     ('sxs', 'OpenOffice.org 1.0 Chart'),
-    ('odc', 'ODF Chart'))
+    )
 
 OPENOFFICE = True