Added new pagesizes module, based on reportlab, with some tests

Author: domdfcoding

domdf_python_tools/pagesizes.py

@@ -314,11 +314,14 @@ def _sequence_convert(seq, to):
 
 
 def parse_measurement(measurement):
-	match = re.findall(r"\d*\.?\d+", measurement)
+	match = re.findall(r"(\d*\.?\d+) *([A-Za-z]*)", measurement)[0]
+	print(match)
+	print(len(match))
 	if len(match) < 2:
 		raise ValueError("Unable to parse measurement")
 	else:
-		val, unit, *_ = match
+		val = float(match[0])
+		unit = match[1]
 		if unit == "mm":
 			return val*mm
 		elif unit == "cm":
@@ -328,6 +331,8 @@ def parse_measurement(measurement):
 			return val
 		elif unit == "inch":
 			return val*inch
+		elif unit == "in":
+			return val*inch
 		elif unit == "pc":
 			return val*pc
 		elif unit == "dd":

tests/test_pagesizes.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+"""
+test_pagesizes
+~~~~~~~~~~~~~~~
+
+Test functions in pagesizes.py
+
+"""
+
+import types
+import pathlib
+import decimal
+
+import pytest
+
+from domdf_python_tools.utils import str2tuple, tuple2str, chunks, list2str, list2string, bdict, pyversion
+from domdf_python_tools.pagesizes import *
+
+
+def test_orientation():
+	assert is_portrait(A4)
+	assert is_portrait(portrait(A4))
+	assert is_portrait(portrait(landscape(A4)))
+	assert is_landscape(landscape(A4))
+	assert is_landscape((10, 5))
+	assert landscape((10, 5)) == (10, 5)
+	assert portrait((5, 10)) == (5, 10)
+	
+	
+def test_parse_measurement():
+	assert parse_measurement("12mm") == 12*mm
+	assert parse_measurement("12 mm") == 12*mm
+	assert parse_measurement("12.34 mm") == 12.34*mm
+	assert parse_measurement("5inch") == 5*inch
+	assert parse_measurement("5in") == 5*inch