Merge 40727f2 into e355a72

tabulator/parsers/inline.py

@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 
 import six
+from collections import OrderedDict
 from ..parser import Parser
 from .. import exceptions
 
@@ -65,7 +66,10 @@ def __iter_extended_rows(self):
             elif isinstance(item, dict):
                 keys = []
                 values = []
-                for key in sorted(item.keys()):
+                iterator = item.keys()
+                if not isinstance(item, OrderedDict):
+                    iterator = sorted(iterator)
+                for key in iterator:
                     keys.append(key)
                     values.append(item[key])
                 yield (row_number, list(keys), list(values))

tests/formats/test_inline.py

@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 
 import pytest
+from collections import OrderedDict
 from tabulator import Stream, exceptions
 
 
@@ -57,3 +58,13 @@ def test_stream_inline_keyed_with_headers_argument():
     with Stream(source, format='inline', headers=['name', 'id']) as stream:
         assert stream.headers == ['name', 'id']
         assert stream.read() == [['english', '1'], ['中国人', '2']]
+
+
+def test_stream_inline_ordered_dict():
+    source = [
+        OrderedDict([('name', 'english'), ('id', '1')]),
+        OrderedDict([('name', '中国人'), ('id', '2')]),
+    ]
+    with Stream(source, headers=1) as stream:
+        assert stream.headers == ['name', 'id']
+        assert stream.read() == [['english', '1'], ['中国人', '2']]