From 55182252023ebc4084c627762935955cabfaf429 Mon Sep 17 00:00:00 2001
From: Tom Quirk <tomquirkacc@gmail.com>
Date: Sun, 17 Sep 2017 14:46:20 +1000
Subject: [PATCH] fig getQifName -> takes datetime.datetime, not str

---
 lib/browser.py |  4 ++--
 lib/qif.py     | 16 +++++++---------
 test.py        |  8 ++++++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/browser.py b/lib/browser.py
index bf37f6a..bef9900 100644
--- a/lib/browser.py
+++ b/lib/browser.py
@@ -12,6 +12,7 @@
 #
 logged_in_urls = ['https://ib.nab.com.au/nabib/acctInfo_acctBal.ctl',
                   'https://ib.nab.com.au/nabib/loginProcess.ctl']
+TRANSACTIONS_PER_PAGE = 200
 
 
 def get_accounts(text):
@@ -234,7 +235,7 @@ def get_servers_today_date(b):
 
 
 def query_server_transactions(b, start_date):
-    TRANSACTIONS_PER_PAGE = 200
+
     end_date = get_servers_today_date(b)
     b.select_form(name='transactionHistoryForm')
     b.form['periodModeSelect'] = ['Custom']
@@ -258,7 +259,6 @@ def query_server_transactions(b, start_date):
 
 
 def get_all_transactions(b, account, start_date):
-    TRANSACTIONS_PER_PAGE = 200
     b = query_server_transactions(b, start_date)
     if not b:
         return None
diff --git a/lib/qif.py b/lib/qif.py
index 46c4334..8b9c775 100644
--- a/lib/qif.py
+++ b/lib/qif.py
@@ -2,18 +2,16 @@
 
 import re
 import os
-import time
+import datetime
 
 
 def get_qif_name(start_date, end_date):
-
-    date_format = '%Y.%m.%d'
-    start = time.strptime(start_date, "%d %b %y")
-    end = time.strptime(end_date, "%d %b %y")
-
-    return '%d.%d.%d - %d.%d.%d.qif' % (
-        start[0], start[1], start[2],
-        end[0], end[1], end[2],
+    """
+    Takes 2 datetime.datetime objects and returns a string representing the QIF file name
+    """
+    return '20%s - 20%s.qif' % (
+        datetime.datetime.strftime(start_date, "%y.%m.%d"),
+        datetime.datetime.strftime(end_date, "%y.%m.%d"),
     )
 
 
diff --git a/test.py b/test.py
index 877d3b7..7bf59a4 100755
--- a/test.py
+++ b/test.py
@@ -3,6 +3,7 @@
 import unittest
 
 from lib import qif
+import datetime
 
 
 class TestQIF(unittest.TestCase):
@@ -12,8 +13,11 @@ def setUp(self):
 
     def test_get_qif_name(self):
 
-        name = qif.get_qif_name('1 Jan 10', '13 Apr 12')
-        self.assertEqual(name, '2010.1.1 - 2012.4.13.qif')
+        name = qif.get_qif_name(
+            datetime.datetime(2010, 1, 1, 00, 00, 00),
+            datetime.datetime(2012, 4, 13, 00, 00, 00)
+        )
+        self.assertEqual(name, '2010.01.01 - 2012.04.13.qif')
 
     def test_is_file_present(self):