releasing 0.3.1

Author: chfw

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Change log
 ================================================================================
 
+0.3.1 - 02.02.2017
+--------------------------------------------------------------------------------
+
+Added
+********************************************************************************
+
+#. Recognize currency type
+
 0.3.0 - 22.12.2016
 --------------------------------------------------------------------------------
 

pyexcel_ods3/converter.py

@@ -55,8 +55,7 @@ def boolean_value(value):
     "date": datetime.date,
     "time": datetime.time,
     "boolean": bool,
-    "percentage": float,
-    "currency": float
+    "percentage": float
 }
 
 

pyexcel_ods3/ods.py

@@ -50,7 +50,13 @@ def cell_value(self, row, column):
         cell = self._native_sheet.get_cell((row, column))
         cell_type = cell.value_type
         ret = None
-        if cell_type in converter.ODS_FORMAT_CONVERSION:
+        if cell_type == 'currency':
+            cell_value = cell.value
+            if is_integer_ok_for_xl_float(cell_value):
+                cell_value = int(cell_value)
+
+            ret = str(cell_value) + ' ' + cell.currency
+        elif cell_type in converter.ODS_FORMAT_CONVERSION:
             value = cell.value
             n_value = converter.VALUE_CONVERTERS[cell_type](value)
             if cell_type == 'float' and self.auto_detect_int:

tests/base.py

@@ -94,45 +94,45 @@ class ODSCellTypes:
     def test_formats(self):
         # date formats
         date_format = "%d/%m/%Y"
-        assert self.data["Sheet1"][0][0] == "Date"
-        assert self.data["Sheet1"][1][0].strftime(date_format) == "11/11/2014"
-        assert self.data["Sheet1"][2][0].strftime(date_format) == "01/01/2001"
-        assert self.data["Sheet1"][3][0] == ""
+        eq_(self.data["Sheet1"][0][0], "Date")
+        eq_(self.data["Sheet1"][1][0].strftime(date_format), "11/11/2014")
+        eq_(self.data["Sheet1"][2][0].strftime(date_format), "01/01/2001")
+        eq_(self.data["Sheet1"][3][0], "")
         # time formats
         time_format = "%S:%M:%H"
-        assert self.data["Sheet1"][0][1] == "Time"
-        assert self.data["Sheet1"][1][1].strftime(time_format) == "12:12:11"
-        assert self.data["Sheet1"][2][1].strftime(time_format) == "12:00:00"
-        assert self.data["Sheet1"][3][1] == 0
-        assert self.data["Sheet1"][4][1] == datetime.timedelta(hours=27,
-                                                               minutes=17,
-                                                               seconds=54)
-        assert self.data["Sheet1"][5][1] == "Other"
+        eq_(self.data["Sheet1"][0][1], "Time")
+        eq_(self.data["Sheet1"][1][1].strftime(time_format), "12:12:11")
+        eq_(self.data["Sheet1"][2][1].strftime(time_format), "12:00:00")
+        eq_(self.data["Sheet1"][3][1], 0)
+        eq_(self.data["Sheet1"][4][1], datetime.timedelta(hours=27,
+                                                          minutes=17,
+                                                          seconds=54))
+        eq_(self.data["Sheet1"][5][1], "Other")
         # boolean
-        assert self.data["Sheet1"][0][2] == "Boolean"
-        assert self.data["Sheet1"][1][2] is True
-        assert self.data["Sheet1"][2][2] is False
+        eq_(self.data["Sheet1"][0][2], "Boolean")
+        eq_(self.data["Sheet1"][1][2], True)
+        eq_(self.data["Sheet1"][2][2], False)
         # Float
-        assert self.data["Sheet1"][0][3] == "Float"
-        assert self.data["Sheet1"][1][3] == 11.11
+        eq_(self.data["Sheet1"][0][3], "Float")
+        eq_(self.data["Sheet1"][1][3], 11.11)
         # Currency
-        assert self.data["Sheet1"][0][4] == "Currency"
-        assert self.data["Sheet1"][1][4] == 1
-        assert self.data["Sheet1"][2][4] == -10000
+        eq_(self.data["Sheet1"][0][4], "Currency")
+        eq_(self.data["Sheet1"][1][4], '1 GBP')
+        eq_(self.data["Sheet1"][2][4], '-10000 GBP')
         # Percentage
-        assert self.data["Sheet1"][0][5] == "Percentage"
-        assert self.data["Sheet1"][1][5] == 2
+        eq_(self.data["Sheet1"][0][5], "Percentage")
+        eq_(self.data["Sheet1"][1][5], 2)
         # int
-        assert self.data["Sheet1"][0][6] == "Int"
-        assert self.data["Sheet1"][1][6] == 3
-        assert self.data["Sheet1"][4][6] == 11
+        eq_(self.data["Sheet1"][0][6], "Int")
+        eq_(self.data["Sheet1"][1][6], 3)
+        eq_(self.data["Sheet1"][4][6], 11)
         # Scientifed not supported
-        assert self.data["Sheet1"][1][7] == 100000
+        eq_(self.data["Sheet1"][1][7], 100000)
         # Fraction
-        assert self.data["Sheet1"][1][8] == 1.25
+        eq_(self.data["Sheet1"][1][8], 1.25)
         # Text
-        assert self.data["Sheet1"][1][9] == "abc"
+        eq_(self.data["Sheet1"][1][9], "abc")
 
         @raises(IndexError)
         def test_no_excessive_trailing_columns(self):
-            assert self.data["Sheet1"][2][6] == ""
+            eq_(self.data["Sheet1"][2][6], "")