Merged upstream python-docx

cmr-acceis · cmr-acceis · commit f113ff6cd854 · 2022-08-19T18:05:14.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
+  - "3.8"
   - "3.6"
-  - "3.5"
   - "2.7"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,24 +1,270 @@
 .. :changelog:
 
+Release History
+---------------
 
-#Release History BayooG/bayoo-docx forked from (python-openxmm/python-docx)
+0.8.11 (2021-05-15)
++++++++++++++++++++
 
+- Small build changes and Python 3.8 version changes like collections.abc location.
 
-0.2.8 (2020-05-02)
 
-- add comments implementation on a run level
-- fix issue with comments date (comments dates are set to current date)
+0.8.10 (2019-01-08)
++++++++++++++++++++
 
+- Revert use of expanded package directory for default.docx to work around setup.py
+  problem with filenames containing square brackets.
 
-0.2.4 (2019-9-4)
 
-- loop over all the document chieldern (Paragraphs, Tables, Sections) with the right order `document.elements`
-- addons to Paragraph Object (delete, heading_level, merge_paragraph )
-- Add low-level implementation for comments part
-- Add oxml element for <w:comments> element and sub-elements
-- Add add_comment() method for docx.text.Paragraph 
-- Add low-level implementation for footnotes part
-- Add oxml element for <w:footnotes> element and sub-elements
-- Add add_footnote() method for docx.text.Paragraph 
+0.8.9 (2019-01-08)
+++++++++++++++++++
 
+- Fix gap in MANIFEST.in that excluded default document template directory
 
+
+0.8.8 (2019-01-07)
+++++++++++++++++++
+
+- Add support for headers and footers
+
+
+0.8.7 (2018-08-18)
+++++++++++++++++++
+
+- Add _Row.height_rule
+- Add _Row.height
+- Add _Cell.vertical_alignment
+- Fix #455: increment next_id, don't fill gaps
+- Add #375: import docx failure on --OO optimization
+- Add #254: remove default zoom percentage
+- Add #266: miscellaneous documentation fixes
+- Add #175: refine MANIFEST.ini
+- Add #168: Unicode error on core-props in Python 2
+
+
+0.8.6 (2016-06-22)
+++++++++++++++++++
+
+- Add #257: add Font.highlight_color
+- Add #261: add ParagraphFormat.tab_stops
+- Add #303: disallow XML entity expansion
+
+
+0.8.5 (2015-02-21)
+++++++++++++++++++
+
+- Fix #149: KeyError on Document.add_table()
+- Fix #78: feature: add_table() sets cell widths
+- Add #106: feature: Table.direction (i.e. right-to-left)
+- Add #102: feature: add CT_Row.trPr
+
+
+0.8.4 (2015-02-20)
+++++++++++++++++++
+
+- Fix #151: tests won't run on PyPI distribution
+- Fix #124: default to inches on no TIFF resolution unit
+
+
+0.8.3 (2015-02-19)
+++++++++++++++++++
+
+- Add #121, #135, #139: feature: Font.color
+
+
+0.8.2 (2015-02-16)
+++++++++++++++++++
+
+- Fix #94: picture prints at wrong size when scaled
+- Extract `docx.document.Document` object from `DocumentPart`
+
+  Refactor `docx.Document` from an object into a factory function for new
+  `docx.document.Document object`. Extract methods from prior `docx.Document`
+  and `docx.parts.document.DocumentPart` to form the new API class and retire
+  `docx.Document` class.
+
+- Migrate `Document.numbering_part` to `DocumentPart.numbering_part`. The
+  `numbering_part` property is not part of the published API and is an
+  interim internal feature to be replaced in a future release, perhaps with
+  something like `Document.numbering_definitions`. In the meantime, it can
+  now be accessed using ``Document.part.numbering_part``.
+
+
+0.8.1 (2015-02-10)
+++++++++++++++++++
+
+- Fix #140: Warning triggered on Document.add_heading/table()
+
+
+0.8.0 (2015-02-08)
+++++++++++++++++++
+
+- Add styles. Provides general capability to access and manipulate paragraph,
+  character, and table styles.
+
+- Add ParagraphFormat object, accessible on Paragraph.paragraph_format, and
+  providing the following paragraph formatting properties:
+
+  + paragraph alignment (justfification)
+  + space before and after paragraph
+  + line spacing
+  + indentation
+  + keep together, keep with next, page break before, and widow control
+
+- Add Font object, accessible on Run.font, providing character-level
+  formatting including:
+
+  + typeface (e.g. 'Arial')
+  + point size
+  + underline
+  + italic
+  + bold
+  + superscript and subscript
+
+The following issues were retired:
+
+- Add feature #56: superscript/subscript
+- Add feature #67: lookup style by UI name
+- Add feature #98: Paragraph indentation
+- Add feature #120: Document.styles
+
+**Backward incompatibilities**
+
+Paragraph.style now returns a Style object. Previously it returned the style
+name as a string. The name can now be retrieved using the Style.name
+property, for example, `paragraph.style.name`.
+
+
+0.7.6 (2014-12-14)
+++++++++++++++++++
+
+- Add feature #69: Table.alignment
+- Add feature #29: Document.core_properties
+
+
+0.7.5 (2014-11-29)
+++++++++++++++++++
+
+- Add feature #65: _Cell.merge()
+
+
+0.7.4 (2014-07-18)
+++++++++++++++++++
+
+- Add feature #45: _Cell.add_table()
+- Add feature #76: _Cell.add_paragraph()
+- Add _Cell.tables property (read-only)
+
+
+0.7.3 (2014-07-14)
+++++++++++++++++++
+
+- Add Table.autofit
+- Add feature #46: _Cell.width
+
+
+0.7.2 (2014-07-13)
+++++++++++++++++++
+
+- Fix: Word does not interpret <w:cr/> as line feed
+
+
+0.7.1 (2014-07-11)
+++++++++++++++++++
+
+- Add feature #14: Run.add_picture()
+
+
+0.7.0 (2014-06-27)
+++++++++++++++++++
+
+- Add feature #68: Paragraph.insert_paragraph_before()
+- Add feature #51: Paragraph.alignment (read/write)
+- Add feature #61: Paragraph.text setter
+- Add feature #58: Run.add_tab()
+- Add feature #70: Run.clear()
+- Add feature #60: Run.text setter
+- Add feature #39: Run.text and Paragraph.text interpret '\n' and '\t' chars
+
+
+0.6.0 (2014-06-22)
+++++++++++++++++++
+
+- Add feature #15: section page size
+- Add feature #66: add section
+- Add page margins and page orientation properties on Section
+- Major refactoring of oxml layer
+
+
+0.5.3 (2014-05-10)
+++++++++++++++++++
+
+- Add feature #19: Run.underline property
+
+
+0.5.2 (2014-05-06)
+++++++++++++++++++
+
+- Add feature #17: character style
+
+
+0.5.1 (2014-04-02)
+++++++++++++++++++
+
+- Fix issue #23, `Document.add_picture()` raises ValueError when document
+  contains VML drawing.
+
+
+0.5.0 (2014-03-02)
+++++++++++++++++++
+
+- Add 20 tri-state properties on Run, including all-caps, double-strike,
+  hidden, shadow, small-caps, and 15 others.
+
+
+0.4.0 (2014-03-01)
+++++++++++++++++++
+
+- Advance from alpha to beta status.
+- Add pure-python image header parsing; drop Pillow dependency
+
+
+0.3.0a5 (2014-01-10)
+++++++++++++++++++++++
+
+- Hotfix: issue #4, Document.add_picture() fails on second and subsequent
+  images.
+
+
+0.3.0a4 (2014-01-07)
+++++++++++++++++++++++
+
+- Complete Python 3 support, tested on Python 3.3
+
+
+0.3.0a3 (2014-01-06)
+++++++++++++++++++++++
+
+- Fix setup.py error on some Windows installs
+
+
+0.3.0a1 (2014-01-05)
+++++++++++++++++++++++
+
+- Full object-oriented rewrite
+- Feature-parity with prior version
+- text: add paragraph, run, text, bold, italic
+- table: add table, add row, add column
+- styles: specify style for paragraph, table
+- picture: add inline picture, auto-scaling
+- breaks: add page break
+- tests: full pytest and behave-based 2-layer test suite
+
+
+0.3.0dev1 (2013-12-14)
+++++++++++++++++++++++
+
+- Round-trip .docx file, preserving all parts and relationships
+- Load default "template" .docx on open with no filename
+- Open from stream and save to stream (file-like object)
+- Add paragraph at and of document
diff --git a/docs/api/enum/WdLineSpacing.rst b/docs/api/enum/WdLineSpacing.rst
@@ -10,7 +10,7 @@ Example::
     from docx.enum.text import WD_LINE_SPACING
 
     paragraph = document.add_paragraph()
-    paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
+    paragraph.paragraph_format.line_spacing_rule = WD_LINE_SPACING.EXACTLY
 
 ----
 
diff --git a/docs/api/style.rst b/docs/api/style.rst
@@ -6,7 +6,7 @@ Style-related objects
 
 A style is used to collect a set of formatting properties under a single name
 and apply those properties to a content object all at once. This promotes
-formatting consistency thoroughout a document and across related documents
+formatting consistency throughout a document and across related documents
 and allows formatting changes to be made globally by changing the definition
 in the appropriate style.
 
diff --git a/docs/dev/analysis/features/shapes/picture.rst b/docs/dev/analysis/features/shapes/picture.rst
@@ -12,7 +12,7 @@ Candidate protocol
 ::
 
     >>> run = paragraph.add_run()
-    >>> inline_shape = run.add_inline_picture(file_like_image, MIME_type=None)
+    >>> inline_shape = run.add_picture(file_like_image, MIME_type=None)
     >>> inline_shape.width = width
     >>> inline_shape.height = height
 
diff --git a/docx/__init__.py b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.2.14' 
+__version__ = "0.8.11"
 
 
 # register custom Part classes with opc package reader
diff --git a/docx/compat.py b/docx/compat.py
@@ -34,6 +34,6 @@ def is_string(obj):
 
     def is_string(obj):
         """Return True if *obj* is a string, False otherwise."""
-        return isinstance(obj, basestring)
+        return isinstance(obj, basestring)  # noqa
 
-    Unicode = unicode
+    Unicode = unicode  # noqa
diff --git a/docx/opc/compat.py b/docx/opc/compat.py
@@ -4,9 +4,7 @@
 Provides Python 2/3 compatibility objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import sys
 
@@ -29,6 +27,7 @@ def is_string(obj):
         """
         return isinstance(obj, str)
 
+
 # ===========================================================================
 # Python 2 versions
 # ===========================================================================
@@ -47,4 +46,4 @@ def is_string(obj):
         """
         Return True if *obj* is a string, False otherwise.
         """
-        return isinstance(obj, basestring)
+        return isinstance(obj, basestring)  # noqa
diff --git a/setup.py b/setup.py
diff --git a/tox.ini b/tox.ini
