summaryrefslogtreecommitdiff
path: root/docs/tutorial.rst
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2016-02-07 07:00:55 -0500
committerKenneth Reitz <me@kennethreitz.org>2016-02-07 07:00:55 -0500
commit8debeb26aca7cc9ef427c70ee9d577eb169f9560 (patch)
tree58316fe5669e86cbea9a1044e4978ffd3b4cc308 /docs/tutorial.rst
parent66d9e50984e7c66fd36fd86f2b469c2dae3636ba (diff)
parenta774789252d41522d4ec8b0e2c212aff4a33904d (diff)
downloadtablib-8debeb26aca7cc9ef427c70ee9d577eb169f9560.tar.gz
Merge branch 'develop' into import_export
# Conflicts: # tablib/core.py # tablib/formats/_csv.py # tablib/formats/_xlsx.py
Diffstat (limited to 'docs/tutorial.rst')
-rw-r--r--docs/tutorial.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index bd2dbc0..551b191 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -39,6 +39,7 @@ You can now start filling this :class:`Dataset <tablib.Dataset>` object with dat
+
-----------
Adding Rows
-----------
@@ -98,6 +99,15 @@ It's that easy.
--------------
+Importing Data
+--------------
+Creating a :class:`tablib.Dataset` object by importing a pre-existing file is simple. ::
+
+ imported_data = tablib.import_set(open('data.csv').read())
+
+This detects what sort of data is being passed in, and uses an appropriate formatter to do the import. So you can import from a variety of different file types.
+
+--------------
Exporting Data
--------------