Skip to content
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

Add diff class to generate diff HTML (and fix build) #477

Merged
merged 2 commits into from Jul 14, 2016

Conversation

thauk-copperleaf
Copy link
Contributor

As per discussion in #470

@thauk-copperleaf
Copy link
Contributor Author

thauk-copperleaf commented Jun 16, 2016

I kept the original object (and the deepcopy() call that creates it) because of the line

if self.skip_row(instance, original):

Is this good enough for now, or should I also try to eliminate the skip_row() call?

@thauk-copperleaf
Copy link
Contributor Author

I noticed the build was failing after your last merge for 3.x builds: https://travis-ci.org/django-import-export/django-import-export/builds/138169098

So I've fixed one of the dependency issues here since I was refactoring the function that caused it.

@thauk-copperleaf
Copy link
Contributor Author

Yes, that seems to have fixed the build :) https://travis-ci.org/django-import-export/django-import-export/builds/138219309

@thauk-copperleaf thauk-copperleaf changed the title Add diff class to generate diff HTML Add diff class to generate diff HTML (and fix build) Jun 20, 2016
@leotop
Copy link

leotop commented Jul 1, 2016

Yes, this fix work for python3. Thank you very much.

@bmihelac bmihelac merged commit 5f2a3bf into django-import-export:master Jul 14, 2016
@bmihelac
Copy link
Member

Merged, thanks!

@thauk-copperleaf thauk-copperleaf deleted the add-diff-class branch July 14, 2016 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants