Skip to content

Commit

Permalink
Updated licence file and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
induane committed Sep 13, 2012
1 parent c8d590d commit e3ee70f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
21 changes: 17 additions & 4 deletions LICENSE.txt
@@ -1,7 +1,20 @@
Copyright (c) 2005-2012 Ian Bicking, Richard Cyganiak
Copyright (c) 2005-2012 Ian Bicking, Richard Cyganiak, Brant Watson

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the
following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3 changes: 1 addition & 2 deletions README.md
Expand Up @@ -2,5 +2,4 @@ Original version is from [Ian Bicking](https://github.com/ianb)
with changes from [Richard Cyganiak](https://github.com/cygri).
License: MIT

Project forked by Brant Watson of Propylon Inc.
Maintained here for interesting changes/fixes
Project forked by Brant Watson for setuptools changes and maintaince.
4 changes: 2 additions & 2 deletions src/htmldiff/htmldiff.py
Expand Up @@ -444,19 +444,19 @@ def diff_files():
sbs_file = 'diff_%s' % output

output = join(path, output_file)

try:
diffed_html = diffFiles(input_file1, input_file2, accurate_mode)
if sbs:
diffed_html = gen_side_by_side(diffed_html)
except Exception, ex:
print ex
exit()
try:

try:
dhtml = open(output, 'w')
dhtml.write(diffed_html)
dhtml.close()

except Exception, ex:
print ex
exit()
Expand Down

0 comments on commit e3ee70f

Please sign in to comment.