better page size handling

This commit is contained in:
Sumpfork 2015-11-20 12:56:38 -08:00
parent 95011627e5
commit 96308eb571

View File

@ -4,7 +4,7 @@ import codecs
import json import json
import sys import sys
from reportlab.lib.pagesizes import LETTER, A4 import reportlab.lib.pagesizes as pagesizes
from reportlab.lib.units import cm from reportlab.lib.units import cm
from cards import Card from cards import Card
@ -147,16 +147,14 @@ def parse_papersize(spec):
else: else:
papersize = spec.upper() papersize = spec.upper()
if papersize == 'A4': try:
print "Using A4 sized paper." paperwidth, paperheight = getattr(pagesizes, papersize)
paperwidth, paperheight = A4 except AttributeError:
elif papersize == 'LETTER': try:
print "Using letter sized paper." paperwidth, paperheight = parseDimensions(papersize)
paperwidth, paperheight = LETTER print 'Using custom paper size, %.2fcm x %.2fcm' % (paperwidth / cm, paperheight / cm)
else: except ValueError:
paperwidth, paperheight = parseDimensions(papersize) paperwidth, paperheight = pagesizes.LETTER
print 'Using custom paper size, %.2fcm x %.2fcm' % (paperwidth / cm, paperheight / cm)
return paperwidth, paperheight return paperwidth, paperheight