Skip to content

Avoid triggering the "style lookup by style_id is deprecated" warning ourselves. #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Avoid triggering the "style lookup by style_id is deprecated" warning ourselves. #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a899fc
Avoid triggering the style lookup by style_id is deprecated warning.
stevecohen42 Feb 10, 2015
9c1a7e9
Fixed the documentation and test-fixtures for 7a899fc24fb5f5bccfc0ea9…
stevecohen42 Feb 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docx/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ def add_heading(self, text='', level=1):
Return a heading paragraph newly added to the end of the document,
populated with *text* and having the heading paragraph style
determined by *level*. If *level* is 0, the style is set to
``'Title'``. If *level* is 1 (or not present), ``'Heading1'`` is used.
Otherwise the style is set to ``'Heading{level}'``. If *level* is
``'Title'``. If *level* is 1 (or not present), ``'Heading 1'`` is used.
Otherwise the style is set to ``'Heading {level}'``. If *level* is
outside the range 0-9, |ValueError| is raised.
"""
if not 0 <= level <= 9:
raise ValueError("level must be in range 0-9, got %d" % level)
style = 'Title' if level == 0 else 'Heading%d' % level
style = 'Title' if level == 0 else 'Heading %d' % level
return self.add_paragraph(text, style)

def add_page_break(self):
Expand Down Expand Up @@ -96,11 +96,11 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
"""
return self._document_part.add_section(start_type)

def add_table(self, rows, cols, style='LightShading-Accent1'):
def add_table(self, rows, cols, style='Light Shading Accent 1'):
"""
Add a table having row and column counts of *rows* and *cols*
respectively and table style of *style*. If *style* is |None|, a
table with no style is produced.
table with 'Light Shading Accent 1' style is produced.
"""
table = self._document_part.add_table(rows, cols)
if style:
Expand Down
8 changes: 4 additions & 4 deletions tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ def it_creates_numbering_part_on_first_access_if_not_present(

@pytest.fixture(params=[
('', None),
('', 'Heading1'),
('foo\rbar', 'BodyText'),
('', 'Heading 1'),
('foo\rbar', 'Body Text'),
])
def add_paragraph_fixture(
self, request, document, document_part_, paragraph_):
Expand All @@ -178,7 +178,7 @@ def add_heading_fixture(
self, request, document, add_paragraph_, paragraph_):
level = request.param
text = 'Spam vs. Bacon'
style = 'Title' if level == 0 else 'Heading%d' % level
style = 'Title' if level == 0 else 'Heading %d' % level
return document, add_paragraph_, paragraph_, text, level, style

@pytest.fixture
Expand All @@ -199,7 +199,7 @@ def add_picture_fixture(self, request, run_, picture_):
def add_section_fixture(self, document, start_type_, section_):
return document, start_type_, section_

@pytest.fixture(params=[None, 'LightShading-Accent1', 'foobar'])
@pytest.fixture(params=[None, 'Light Shading Accent 1', 'foobar'])
def add_table_fixture(self, request, document, document_part_, table_):
rows, cols = 4, 2
style = expected_style = request.param
Expand Down