Merge pull request #110 from djrobstep/develop

Fix for a broken YAML test and tsv autodetection

2 files changed, 3 insertions, 3 deletions

diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py
index 3cda71b..c5d3202 100644
--- a/tablib/formats/_csv.py
+++ b/tablib/formats/_csv.py
@@ -49,7 +49,7 @@ def import_set(dset, in_stream, headers=True):
 def detect(stream):
     """Returns True if given stream is valid CSV."""
     try:
-        csv.Sniffer().sniff(stream)
+        csv.Sniffer().sniff(stream, delimiters=',')
         return True
     except (csv.Error, TypeError):
         return False
diff --git a/tablib/formats/_yaml.py b/tablib/formats/_yaml.py
index e2ccf46..0052b0f 100644
--- a/tablib/formats/_yaml.py
+++ b/tablib/formats/_yaml.py
@@ -26,12 +26,12 @@ extensions = ('yaml', 'yml')
 def export_set(dataset):
     """Returns YAML representation of Dataset."""
 
-    return yaml.dump(dataset._package(ordered=False))
+    return yaml.safe_dump(dataset._package(ordered=False))
 
 
 def export_book(databook):
     """Returns YAML representation of Databook."""
-    return yaml.dump(databook._package())
+    return yaml.safe_dump(databook._package(ordered=False))
 
 
 def import_set(dset, in_stream):