浏览代码

[develop] Upgrade tablib to 0.10.0

This doesn't change a substantial amount of code, it just fixes
some minor unicode issues in headers
Erick Tryzelaar 10 年之前
父节点
当前提交
08507d41d4
共有 100 个文件被更改,包括 399 次插入13 次删除
  1. 6 1
      desktop/core/ext-py/tablib-0.10.0/AUTHORS
  2. 0 0
      desktop/core/ext-py/tablib-0.10.0/HISTORY.rst
  3. 0 0
      desktop/core/ext-py/tablib-0.10.0/LICENSE
  4. 1 0
      desktop/core/ext-py/tablib-0.10.0/MANIFEST.in
  5. 0 0
      desktop/core/ext-py/tablib-0.10.0/NOTICE
  6. 366 0
      desktop/core/ext-py/tablib-0.10.0/PKG-INFO
  7. 3 0
      desktop/core/ext-py/tablib-0.10.0/README.rst
  8. 8 0
      desktop/core/ext-py/tablib-0.10.0/setup.cfg
  9. 6 3
      desktop/core/ext-py/tablib-0.10.0/setup.py
  10. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/__init__.py
  11. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/compat.py
  12. 4 4
      desktop/core/ext-py/tablib-0.10.0/tablib/core.py
  13. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/__init__.py
  14. 2 2
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_csv.py
  15. 3 3
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_html.py
  16. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_json.py
  17. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_ods.py
  18. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_tsv.py
  19. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_xls.py
  20. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_xlsx.py
  21. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/formats/_yaml.py
  22. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/__init__.py
  23. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/markup.py
  24. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/markup3.py
  25. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/__init__.py
  26. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/anim.py
  27. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/attrconverters.py
  28. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/chart.py
  29. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/config.py
  30. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/dc.py
  31. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/dr3d.py
  32. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/draw.py
  33. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/easyliststyle.py
  34. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/element.py
  35. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/elementtypes.py
  36. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/form.py
  37. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/grammar.py
  38. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/load.py
  39. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/manifest.py
  40. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/math.py
  41. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/meta.py
  42. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/namespaces.py
  43. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/number.py
  44. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/odf2moinmoin.py
  45. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/odf2xhtml.py
  46. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/odfmanifest.py
  47. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/office.py
  48. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/opendocument.py
  49. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/presentation.py
  50. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/script.py
  51. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/style.py
  52. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/svg.py
  53. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/table.py
  54. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/teletype.py
  55. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/text.py
  56. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/thumbnail.py
  57. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/userfield.py
  58. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/xforms.py
  59. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/__init__.py
  60. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/anim.py
  61. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/attrconverters.py
  62. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/chart.py
  63. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/config.py
  64. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/dc.py
  65. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/dr3d.py
  66. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/draw.py
  67. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/easyliststyle.py
  68. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/element.py
  69. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/elementtypes.py
  70. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/form.py
  71. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/grammar.py
  72. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/load.py
  73. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/manifest.py
  74. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/math.py
  75. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/meta.py
  76. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/namespaces.py
  77. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/number.py
  78. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/odf2moinmoin.py
  79. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/odf2xhtml.py
  80. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/odfmanifest.py
  81. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/office.py
  82. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/opendocument.py
  83. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/presentation.py
  84. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/script.py
  85. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/style.py
  86. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/svg.py
  87. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/table.py
  88. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/teletype.py
  89. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/text.py
  90. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/thumbnail.py
  91. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/userfield.py
  92. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/xforms.py
  93. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/omnijson/__init__.py
  94. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/omnijson/core.py
  95. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/__init__.py
  96. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/cell.py
  97. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/chart.py
  98. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/drawing.py
  99. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/namedrange.py
  100. 0 0
      desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/reader/__init__.py

+ 6 - 1
desktop/core/ext-py/tablib-develop/AUTHORS → desktop/core/ext-py/tablib-0.10.0/AUTHORS

@@ -4,9 +4,14 @@ various contributors:
 Development Lead
 ````````````````
 
-- Kenneth Reitz <_@kennethreitz.com>
+- Kenneth Reitz <me@kennethreitz.org>
 
 
+Core Contributors
+`````````````````
+
+- Iuri de Silvio <iurisilvio@gmail.com>
+
 Patches and Suggestions
 ```````````````````````
 

+ 0 - 0
desktop/core/ext-py/tablib-develop/HISTORY.rst → desktop/core/ext-py/tablib-0.10.0/HISTORY.rst


+ 0 - 0
desktop/core/ext-py/tablib-develop/LICENSE → desktop/core/ext-py/tablib-0.10.0/LICENSE


+ 1 - 0
desktop/core/ext-py/tablib-0.10.0/MANIFEST.in

@@ -0,0 +1 @@
+include HISTORY.rst README.rst LICENSE AUTHORS NOTICE test_tablib.py

+ 0 - 0
desktop/core/ext-py/tablib-develop/NOTICE → desktop/core/ext-py/tablib-0.10.0/NOTICE


+ 366 - 0
desktop/core/ext-py/tablib-0.10.0/PKG-INFO

@@ -0,0 +1,366 @@
+Metadata-Version: 1.1
+Name: tablib
+Version: 0.10.0
+Summary: Format agnostic tabular data library (XLS, JSON, YAML, CSV)
+Home-page: http://python-tablib.org
+Author: Kenneth Reitz
+Author-email: me@kennethreitz.org
+License: MIT
+Description: Tablib: format-agnostic tabular dataset library
+        ===============================================
+        
+        .. image:: https://travis-ci.org/kennethreitz/tablib.svg?branch=develop
+            :target: https://travis-ci.org/kennethreitz/tablib
+        
+        ::
+        
+        	_____         ______  ___________ ______
+        	__  /_______ ____  /_ ___  /___(_)___  /_
+        	_  __/_  __ `/__  __ \__  / __  / __  __ \
+        	/ /_  / /_/ / _  /_/ /_  /  _  /  _  /_/ /
+        	\__/  \__,_/  /_.___/ /_/   /_/   /_.___/
+        
+        
+        
+        Tablib is a format-agnostic tabular dataset library, written in Python.
+        
+        Output formats supported:
+        
+        - Excel (Sets + Books)
+        - JSON (Sets + Books)
+        - YAML (Sets + Books)
+        - HTML (Sets)
+        - TSV (Sets)
+        - CSV (Sets)
+        
+        Note that tablib *purposefully* excludes XML support. It always will. (Note: This is a joke. Pull requests are welcome.)
+        
+        Overview
+        --------
+        
+        `tablib.Dataset()`
+        	A Dataset is a table of tabular data. It may or may not have a header row. They can be build and manipulated as raw Python datatypes (Lists of tuples|dictionaries). Datasets can be imported from JSON, YAML, and CSV; they can be exported to XLSX, XLS, ODS, JSON, YAML, CSV, TSV, and HTML.
+        
+        `tablib.Databook()`
+        	A Databook is a set of Datasets. The most common form of a Databook is an Excel file with multiple spreadsheets. Databooks can be imported from JSON and YAML; they can be exported to XLSX, XLS, ODS, JSON, and YAML.
+        
+        Usage
+        -----
+        
+        
+        Populate fresh data files: ::
+        
+            headers = ('first_name', 'last_name')
+        
+            data = [
+                ('John', 'Adams'),
+                ('George', 'Washington')
+            ]
+        
+            data = tablib.Dataset(*data, headers=headers)
+        
+        
+        Intelligently add new rows: ::
+        
+            >>> data.append(('Henry', 'Ford'))
+        
+        Intelligently add new columns: ::
+        
+            >>> data.append_col((90, 67, 83), header='age')
+        
+        Slice rows:  ::
+        
+            >>> print data[:2]
+            [('John', 'Adams', 90), ('George', 'Washington', 67)]
+        
+        
+        Slice columns by header: ::
+        
+            >>> print data['first_name']
+            ['John', 'George', 'Henry']
+        
+        Easily delete rows: ::
+        
+            >>> del data[1]
+        
+        Exports
+        -------
+        
+        Drumroll please...........
+        
+        JSON!
+        +++++
+        ::
+        
+        	>>> print data.json
+        	[
+        	  {
+        	    "last_name": "Adams",
+        	    "age": 90,
+        	    "first_name": "John"
+        	  },
+        	  {
+        	    "last_name": "Ford",
+        	    "age": 83,
+        	    "first_name": "Henry"
+        	  }
+        	]
+        
+        
+        YAML!
+        +++++
+        ::
+        
+        	>>> print data.yaml
+        	- {age: 90, first_name: John, last_name: Adams}
+        	- {age: 83, first_name: Henry, last_name: Ford}
+        
+        CSV...
+        ++++++
+        ::
+        
+        	>>> print data.csv
+        	first_name,last_name,age
+        	John,Adams,90
+        	Henry,Ford,83
+        
+        EXCEL!
+        ++++++
+        ::
+        
+        	>>> with open('people.xls', 'wb') as f:
+        	...     f.write(data.xls)
+        
+        It's that easy.
+        
+        
+        Installation
+        ------------
+        
+        To install tablib, simply: ::
+        
+        	$ pip install tablib
+        
+        Or, if you absolutely must: ::
+        
+        	$ easy_install tablib
+        
+        Contribute
+        ----------
+        
+        If you'd like to contribute, simply fork `the repository`_, commit your
+        changes to the **develop** branch (or branch off of it), and send a pull
+        request. Make sure you add yourself to AUTHORS_.
+        
+        
+        
+        
+        .. _`the repository`: http://github.com/kennethreitz/tablib
+        .. _AUTHORS: http://github.com/kennethreitz/tablib/blob/master/AUTHORS
+        
+        
+        History
+        -------
+        
+        ++++
+        
+        * Unicode Column Headers
+        
+        0.9.11 (2011-06-30)
+        +++++++++++++++++++
+        
+        * Bugfixes
+        
+        0.9.10 (2011-06-22)
+        +++++++++++++++++++
+        
+        * Bugfixes
+        
+        0.9.9 (2011-06-21)
+        ++++++++++++++++++
+        
+        * Dataset API Changes
+        * ``stack_rows`` => ``stack``, ``stack_columns`` => ``stack_cols``
+        * column operations have their own methods now (``append_col``, ``insert_col``)
+        * List-style ``pop()``
+        * Redis-style ``rpush``, ``lpush``, ``rpop``, ``lpop``, ``rpush_col``, and ``lpush_col``
+        
+        0.9.8 (2011-05-22)
+        ++++++++++++++++++
+        
+        * OpenDocument Spreadsheet support (.ods)
+        * Full Unicode TSV support
+        
+        
+        0.9.7 (2011-05-12)
+        ++++++++++++++++++
+        
+        * Full XLSX Support!
+        * Pickling Bugfix
+        * Compat Module
+        
+        
+        0.9.6 (2011-05-12)
+        ++++++++++++++++++
+        
+        * ``seperators`` renamed to ``separators``
+        * Full unicode CSV support
+        
+        
+        0.9.5 (2011-03-24)
+        ++++++++++++++++++
+        
+        * Python 3.1, Python 3.2 Support (same code base!)
+        * Formatter callback support
+        * Various bug fixes
+        
+        
+        
+        0.9.4 (2011-02-18)
+        ++++++++++++++++++
+        
+        * Python 2.5 Support!
+        * Tox Testing for 2.5, 2.6, 2.7
+        * AnyJSON Integrated
+        * OrderedDict support
+        * Caved to community pressure (spaces)
+        
+        
+        0.9.3 (2011-01-31)
+        ++++++++++++++++++
+        
+        * Databook duplication leak fix.
+        * HTML Table output.
+        * Added column sorting.
+        
+        
+        0.9.2 (2010-11-17)
+        ++++++++++++++++++
+        
+        * Transpose method added to Datasets.
+        * New frozen top row in Excel output.
+        * Pickling support for Datasets and Rows.
+        * Support for row/column stacking.
+        
+        
+        0.9.1 (2010-11-04)
+        ++++++++++++++++++
+        
+        * Minor reference shadowing bugfix.
+        
+        
+        0.9.0 (2010-11-04)
+        ++++++++++++++++++
+        
+        * Massive documentation update!
+        * Tablib.org!
+        * Row tagging and Dataset filtering!
+        * Column insert/delete support
+        * Column append API change (header required)
+        * Internal Changes (Row object and use thereof)
+        
+        
+        0.8.5 (2010-10-06)
+        ++++++++++++++++++
+        
+        * New import system. All dependencies attempt to load from site-packages,
+          then fallback on tenderized modules.
+        
+        
+        0.8.4 (2010-10-04)
+        ++++++++++++++++++
+        
+        * Updated XLS output: Only wrap if '\\n' in cell.
+        
+        
+        0.8.3 (2010-10-04)
+        ++++++++++++++++++
+        
+        * Ability to append new column passing a callable
+          as the value that will be applied to every row.
+        
+        
+        0.8.2 (2010-10-04)
+        ++++++++++++++++++
+        
+        * Added alignment wrapping to written cells.
+        * Added separator support to XLS.
+        
+        
+        0.8.1 (2010-09-28)
+        ++++++++++++++++++
+        
+        * Packaging Fix
+        
+        
+        0.8.0 (2010-09-25)
+        ++++++++++++++++++
+        
+        * New format plugin system!
+        * Imports! ELEGANT Imports!
+        * Tests. Lots of tests.
+        
+        
+        0.7.1 (2010-09-20)
+        ++++++++++++++++++
+        
+        * Reverting methods back to properties.
+        * Windows bug compensated in documentation.
+        
+        
+        0.7.0 (2010-09-20)
+        ++++++++++++++++++
+        
+        * Renamed DataBook Databook for consistency.
+        * Export properties changed to methods (XLS filename / StringIO bug).
+        * Optional Dataset.xls(path='filename') support (for writing on windows).
+        * Added utf-8 on the worksheet level.
+        
+        
+        0.6.4 (2010-09-19)
+        ++++++++++++++++++
+        
+        * Updated unicode export for XLS.
+        * More exhaustive unit tests.
+        
+        
+        0.6.3 (2010-09-14)
+        ++++++++++++++++++
+        * Added Dataset.append() support for columns.
+        
+        
+        0.6.2 (2010-09-13)
+        ++++++++++++++++++
+        * Fixed Dataset.append() error on empty dataset.
+        * Updated Dataset.headers property w/ validation.
+        * Added Testing Fixtures.
+        
+        0.6.1 (2010-09-12)
+        ++++++++++++++++++
+        
+        * Packaging hotfixes.
+        
+        
+        0.6.0 (2010-09-11)
+        ++++++++++++++++++
+        
+        * Public Release.
+        * Export Support for XLS, JSON, YAML, and CSV.
+        * DataBook Export for XLS, JSON, and YAML.
+        * Python Dict Property Support.
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.0
+Classifier: Programming Language :: Python :: 3.1
+Classifier: Programming Language :: Python :: 3.2
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4

+ 3 - 0
desktop/core/ext-py/tablib-develop/README.rst → desktop/core/ext-py/tablib-0.10.0/README.rst

@@ -1,6 +1,9 @@
 Tablib: format-agnostic tabular dataset library
 ===============================================
 
+.. image:: https://travis-ci.org/kennethreitz/tablib.svg?branch=develop
+    :target: https://travis-ci.org/kennethreitz/tablib
+
 ::
 
 	_____         ______  ___________ ______

+ 8 - 0
desktop/core/ext-py/tablib-0.10.0/setup.cfg

@@ -0,0 +1,8 @@
+[wheel]
+universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+

+ 6 - 3
desktop/core/ext-py/tablib-develop/setup.py → desktop/core/ext-py/tablib-0.10.0/setup.py

@@ -33,8 +33,8 @@ if sys.argv[-1] == 'test':
         print('py.test required.')
         sys.exit(1)
 
-    os.system('py.test test_tablib.py')
-    sys.exit()
+    errors = os.system('py.test test_tablib.py')
+    sys.exit(bool(errors))
 
 setup(
     name='tablib',
@@ -43,7 +43,7 @@ setup(
     long_description=(open('README.rst').read() + '\n\n' +
         open('HISTORY.rst').read()),
     author='Kenneth Reitz',
-    author_email='me@kennethreitz.com',
+    author_email='me@kennethreitz.org',
     url='http://python-tablib.org',
     packages=[
         'tablib', 'tablib.formats',
@@ -64,6 +64,7 @@ setup(
         'tablib.packages.openpyxl3.reader',
         'tablib.packages.openpyxl3.writer',
         'tablib.packages.yaml',
+        'tablib.packages.yaml3',
         'tablib.packages.unicodecsv'
     ],
     license='MIT',
@@ -79,6 +80,8 @@ setup(
         'Programming Language :: Python :: 3.0',
         'Programming Language :: Python :: 3.1',
         'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
     ),
     tests_require=['pytest'],
 )

+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/__init__.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/compat.py → desktop/core/ext-py/tablib-0.10.0/tablib/compat.py


+ 4 - 4
desktop/core/ext-py/tablib-develop/tablib/core.py → desktop/core/ext-py/tablib-0.10.0/tablib/core.py

@@ -5,7 +5,7 @@
 
     This module implements the central Tablib objects.
 
-    :copyright: (c) 2011 by Kenneth Reitz.
+    :copyright: (c) 2014 by Kenneth Reitz.
     :license: MIT, see LICENSE for more details.
 """
 
@@ -18,11 +18,11 @@ from tablib.compat import OrderedDict, unicode
 
 
 __title__ = 'tablib'
-__version__ = '0.9.11'
-__build__ = 0x000911
+__version__ = '0.10.0'
+__build__ = 0x001000
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2011 Kenneth Reitz'
+__copyright__ = 'Copyright 2014 Kenneth Reitz'
 __docformat__ = 'restructuredtext'
 
 

+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/__init__.py


+ 2 - 2
desktop/core/ext-py/tablib-develop/tablib/formats/_csv.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_csv.py

@@ -35,9 +35,9 @@ def import_set(dset, in_stream, headers=True):
     dset.wipe()
 
     if is_py3:
-        rows = csv.reader(in_stream.splitlines())
+        rows = csv.reader(StringIO(in_stream))
     else:
-        rows = csv.reader(in_stream.splitlines(), encoding=DEFAULT_ENCODING)
+        rows = csv.reader(StringIO(in_stream), encoding=DEFAULT_ENCODING)
     for i, row in enumerate(rows):
 
         if (i == 0) and (headers):

+ 3 - 3
desktop/core/ext-py/tablib-develop/tablib/formats/_html.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_html.py

@@ -5,15 +5,15 @@
 
 import sys
 
-
 if sys.version_info[0] > 2:
-    from io import StringIO
+    from io import BytesIO as StringIO
     from tablib.packages import markup3 as markup
 else:
     from cStringIO import StringIO
     from tablib.packages import markup
 
 import tablib
+from tablib.compat import unicode
 import codecs
 
 BOOK_ENDINGS = 'h3'
@@ -50,7 +50,7 @@ def export_set(dataset):
 	wrapper = codecs.getwriter("utf8")(stream)
 	wrapper.writelines(unicode(page))
 
-	return stream.getvalue()
+	return stream.getvalue().decode('utf-8')
 
 
 def export_book(databook):

+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/_json.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_json.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/_ods.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_ods.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/_tsv.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_tsv.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/_xls.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_xls.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/_xlsx.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_xlsx.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/formats/_yaml.py → desktop/core/ext-py/tablib-0.10.0/tablib/formats/_yaml.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/docs/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/__init__.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/markup.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/markup.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/markup3.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/markup3.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/__init__.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/anim.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/anim.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/attrconverters.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/attrconverters.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/chart.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/chart.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/config.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/config.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/dc.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/dc.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/dr3d.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/dr3d.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/draw.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/draw.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/easyliststyle.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/easyliststyle.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/element.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/element.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/elementtypes.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/elementtypes.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/form.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/form.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/grammar.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/grammar.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/load.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/load.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/manifest.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/manifest.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/math.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/math.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/meta.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/meta.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/namespaces.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/namespaces.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/number.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/number.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/odf2moinmoin.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/odf2moinmoin.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/odf2xhtml.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/odf2xhtml.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/odfmanifest.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/odfmanifest.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/office.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/office.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/opendocument.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/opendocument.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/presentation.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/presentation.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/script.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/script.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/style.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/style.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/svg.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/svg.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/table.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/table.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/teletype.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/teletype.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/text.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/text.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/thumbnail.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/thumbnail.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/userfield.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/userfield.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/xforms.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf/xforms.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/__init__.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/anim.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/anim.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/attrconverters.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/attrconverters.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/chart.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/chart.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/config.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/config.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/dc.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/dc.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/dr3d.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/dr3d.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/draw.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/draw.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/easyliststyle.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/easyliststyle.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/element.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/element.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/elementtypes.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/elementtypes.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/form.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/form.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/grammar.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/grammar.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/load.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/load.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/manifest.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/manifest.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/math.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/math.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/meta.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/meta.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/namespaces.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/namespaces.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/number.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/number.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/odf2moinmoin.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/odf2moinmoin.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/odf2xhtml.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/odf2xhtml.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/odfmanifest.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/odfmanifest.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/office.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/office.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/opendocument.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/opendocument.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/presentation.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/presentation.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/script.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/script.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/style.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/style.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/svg.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/svg.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/table.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/table.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/teletype.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/teletype.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/text.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/text.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/thumbnail.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/thumbnail.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/userfield.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/userfield.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/odf3/xforms.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/odf3/xforms.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/omnijson/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/omnijson/__init__.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/omnijson/core.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/omnijson/core.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/openpyxl/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/__init__.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/openpyxl/cell.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/cell.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/openpyxl/chart.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/chart.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/openpyxl/drawing.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/drawing.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/openpyxl/namedrange.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/namedrange.py


+ 0 - 0
desktop/core/ext-py/tablib-develop/tablib/packages/openpyxl/reader/__init__.py → desktop/core/ext-py/tablib-0.10.0/tablib/packages/openpyxl/reader/__init__.py


部分文件因为文件数量过多而无法显示