Replaced vendored pyyaml by a dependency (#278)

NOTICE

@@ -1,4 +1,4 @@
-Tablib includes some vendorized python libraries: ordereddict, odfpy, pyyaml,
+Tablib includes some vendorized python libraries: ordereddict, odfpy,
 simplejson, unicodecsv.
 
 Markup License
@@ -241,32 +241,6 @@ subject to the following conditions:
     OTHER DEALINGS IN THE SOFTWARE.
 
 
-
-PyYAML License
-==============
-
-Copyright (c) 2006 Kirill Simonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-
 UnicodeCSV License
 ==================
 

docs/install.rst

@@ -46,11 +46,7 @@ Speed Extensions
 
 .. versionadded:: 0.8.5
 
-Tablib is partially dependent on the **pyyaml**, **simplejson**, and **xlwt** modules. To reduce installation issues, fully integrated versions of all required libraries are included in Tablib.
-
-However, if performance is important to you (and it should be), you can install  **pyyaml** with C extensions from PyPi. ::
-
-    $ pip install PyYAML
+Tablib is partially dependent on the **simplejson**, and **xlwt** modules. To reduce installation issues, fully integrated versions of all required libraries are included in Tablib.
 
 If you're using Python 2.5, you should also install the **simplejson** module (pip will do this for you). If you're using Python 2.6+, the built-in **json** module is already optimized and in use. ::
 

setup.py

@@ -21,7 +21,7 @@
         print('Pip required.')
         sys.exit(1)
 
-    os.system('pip install ujson pyyaml')
+    os.system('pip install ujson')
     sys.exit()
 
 if sys.argv[-1] == 'test':
@@ -39,10 +39,8 @@
     'tablib.packages',
     'tablib.packages.omnijson',
     'tablib.packages.odf',
-    'tablib.packages.yaml',
     'tablib.packages.dbfpy',
     'tablib.packages.odf3',
-    'tablib.packages.yaml3',
     'tablib.packages.dbfpy3'
 ]
 
@@ -51,6 +49,7 @@
     'unicodecsv',
     'xlrd',
     'xlwt',
+    'pyyaml',
 ]
 
 with open('tablib/core.py', 'r') as fd:

tablib/formats/_yaml.py

@@ -3,17 +3,8 @@
 """ Tablib - YAML Support.
 """
 
-import sys
-
-try:
-    import yaml
-except ImportError:
-    if sys.version_info[0] > 2:
-        import tablib.packages.yaml3 as yaml
-    else:
-        import tablib.packages.yaml as yaml
-
 import tablib
+import yaml
 
 title = 'yaml'
 extensions = ('yaml', 'yml')