Skip to content

Useability changes (python3 check, import removal, stderr usage) #16

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

Merged
merged 3 commits into from
Jul 11, 2017
Merged

Useability changes (python3 check, import removal, stderr usage) #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed92fc8
Add specific check for python 3+.
neiljp Jul 11, 2017
5edc83a
Remove accidental import of 'six' from earlier commit.
neiljp Jul 11, 2017
6928424
Redirect errors to stderr.
neiljp Jul 11, 2017
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
13 changes: 8 additions & 5 deletions pdf_diff/command_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
#!/usr/bin/python3

import sys, json, subprocess, io, os
import sys

if sys.version_info[0] < 3:
sys.exit("ERROR: Python version 3+ is required.")

import json, subprocess, io, os
from lxml import etree
from PIL import Image, ImageDraw, ImageOps

from six import int2byte

def compute_changes(pdf_fn_1, pdf_fn_2, top_margin=0):
# Serialize the text in the two PDFs.
docs = [serialize_pdf(0, pdf_fn_1, top_margin), serialize_pdf(1, pdf_fn_2, top_margin)]
Expand Down Expand Up @@ -455,8 +458,8 @@ def main():
args = parser.parse_args()

def invalid_usage(msg):
print('ERROR: %s' % (msg))
parser.print_usage()
sys.stderr.write('ERROR: %s%s' % (msg, os.linesep))
parser.print_usage(sys.stderr)
sys.exit(1)

# Validate style
Expand Down