Skip to content

Stop overriding the handlers in the test cases #29

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.

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

Merged
merged 11 commits into from
May 22, 2013
Merged

Stop overriding the handlers in the test cases #29

merged 11 commits into from
May 22, 2013

Conversation

jlward
Copy link
Contributor

@jlward jlward commented May 21, 2013

That defeats the purpose. Plus it's time to stop being lazy and fully convert the tests from docx2html syntax to pydocx.

@ghost ghost assigned jlward May 21, 2013
.left{{text-align:left}} .comment{{color:blue}}
body{{width:%(width)spx; margin:0px auto;
}}</style>''') % {
return textwrap.dedent('<style>.insert {color:green;}.delete {color:red;text-decoration:line-through;}.center {text-align:center;}.right {text-align:right;}.left {text-align:left;}.comment {color:blue;}body {width:0px;margin:0px auto;}</style>') % { # noqa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use a line continuation here. This is pretty rough to read/review.

@winhamwr
Copy link
Contributor

I'll wait to review this more until #28 is merged in.

Jason Ward added 3 commits May 21, 2013 14:45
Conflicts:
	pydocx/parsers/Docx2Html.py
	pydocx/tests/test_docx.py
	pydocx/tests/test_xml.py
}}</style>''') % {
result = (
'<style>'
'.pydocx-insert {color:green;}'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming that in #30 we're going to fix the indentation and spacing here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, what's wrong with the indentation here? This is the fix.
On May 21, 2013 3:06 PM, "Wes Winham" [email protected] wrote:

In pydocx/parsers/Docx2Html.py:

@@ -21,16 +20,22 @@ def head(self):
}

 def style(self):
  •    return textwrap.dedent('''<style>.insert{{color:red}}.delete
    
  •    {{color:red; text-decoration:line-through}}.center
    
  •    {{text-align:center}}.right{{text-align:right}}
    
  •    .left{{text-align:left}} .comment{{color:blue}}
    
  •    .pydocx-underline {text-decoration: underline;}
    
  •    body{{width:%(width)spx; margin:0px auto;
    
  •    }}</style>''') % {
    
  •    result = (
    
  •        '<style>'
    
  •        '.pydocx-insert {color:green;}'
    

I'm assuming that in #30https://github.com/OpenScienceFramework/pydocx/issues/30we're going to fix the indentation and spacing here.


Reply to this email directly or view it on GitHubhttps://github.com//pull/29/files#r4324013
.

@winhamwr
Copy link
Contributor

Looks good.

jlward added a commit that referenced this pull request May 22, 2013
Stop overriding the handlers in the test cases
@jlward jlward merged commit 5984952 into master May 22, 2013
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward added a commit that referenced this pull request Mar 14, 2014
Stop overriding the handlers in the test cases
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward pushed a commit that referenced this pull request Mar 14, 2014
jlward added a commit that referenced this pull request Mar 14, 2014
Stop overriding the handlers in the test cases
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants