From 9320c689614a0525a7a4879c84a95e4c4a3b7223 Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Sat, 7 Jan 2017 14:52:33 -0600
Subject: [PATCH] use BytesIO to work with python3

---
 pyaccuwage/__init__.py |  6 +++---
 pyaccuwage/fields.py   | 19 ++++++++++---------
 pyaccuwage/model.py    |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pyaccuwage/__init__.py b/pyaccuwage/__init__.py
index fae797e..2de4c7b 100644
--- a/pyaccuwage/__init__.py
+++ b/pyaccuwage/__init__.py
@@ -37,7 +37,7 @@ def test_dump():
         record.EmployerRecord(),
         record.EmployeeWageRecord(),
         ]
-    out = io.StringIO()
+    out = io.BytesIO()
     dump(records, out)
     return out
 
@@ -75,7 +75,7 @@ def load(fp):
 
 def loads(s):
     import io
-    fp = io.StringIO(s)
+    fp = io.BytesIO(s)
     return load(fp)
 
 
@@ -85,7 +85,7 @@ def dump(records, fp):
 
 def dumps(records):
     import io
-    fp = io.StringIO()
+    fp = io.BytesIO()
     dump(records, fp)
     fp.seek(0)
     return fp.read()
diff --git a/pyaccuwage/fields.py b/pyaccuwage/fields.py
index ff57391..495aa5c 100644
--- a/pyaccuwage/fields.py
+++ b/pyaccuwage/fields.py
@@ -148,7 +148,8 @@ class StateField(TextField):
     def get_data(self):
         value = self.value or ""
         if value.strip() and self.use_numeric:
-            return str(enums.state_postal_numeric[value.upper()]).zfill(self.max_length)
+            postcode = bytes(str(enums.state_postal_numeric[value.upper()]), 'ascii')
+            return postcode.zfill(self.max_length)
         else:
             return value.ljust(self.max_length).encode('ascii')[:self.max_length]
 
@@ -180,8 +181,8 @@ class IntegerField(TextField):
 
 
     def get_data(self):
-        value = self.value or ""
-        return str(value).zfill(self.max_length)[:self.max_length]
+        value = bytes(str(self.value), 'ascii') if self.value else b''
+        return value.zfill(self.max_length)[:self.max_length]
 
     def parse(self, s):
         self.value = int(s)
@@ -201,7 +202,7 @@ class BlankField(TextField):
         super(TextField, self).__init__(name=name, max_length=max_length, required=required, uppercase=False)
 
     def get_data(self):
-        return " " * self.max_length
+        return b' ' * self.max_length
 
     def parse(self, s):
         pass
@@ -233,7 +234,7 @@ class BooleanField(Field):
         pass
 
     def get_data(self):
-        return '1' if self._value else '0'
+        return b'1' if self._value else b'0'
 
     def parse(self, s):
         self.value = (s == '1')
@@ -264,8 +265,8 @@ class DateField(TextField):
 
     def get_data(self):
         if self._value:
-            return self._value.strftime('%m%d%Y')
-        return '0' * self.max_length
+            return bytes(self._value.strftime('%m%d%Y'), 'ascii')
+        return b'0' * self.max_length
 
     def parse(self, s):
         if int(s) > 0:
@@ -296,8 +297,8 @@ class MonthYearField(TextField):
 
     def get_data(self):
         if self._value:
-            return self._value.strftime("%m%Y")
-        return '0' * self.max_length
+            return bytes(self._value.strftime("%m%Y"), 'ascii')
+        return b'0' * self.max_length
 
     def parse(self, s):
         if int(s) > 0:
diff --git a/pyaccuwage/model.py b/pyaccuwage/model.py
index 103738e..93d9251 100644
--- a/pyaccuwage/model.py
+++ b/pyaccuwage/model.py
@@ -57,7 +57,7 @@ class Model(object):
                  custom_validator(f)
 
     def output(self):
-        result = ''.join([field.get_data() for field in self.get_sorted_fields()])
+        result = b''.join([field.get_data() for field in self.get_sorted_fields()])
 
         if hasattr(self, 'record_length') and len(result) != self.record_length:
             raise ValidationError("Record result length not equal to %d bytes (%d)" % (self.record_length, len(result)))