Merge branch 'master' into oauth

ej2 · ej2 · commit 56bfd5a31828 · 2017-08-18T14:22:55.000-07:00
diff --git a/quickbooks/cdc.py b/quickbooks/cdc.py
@@ -5,33 +5,33 @@
 
 
 def change_data_capture(qbo_class_list, timestamp, qb=None):
-	if qb is None:
-		qb = QuickBooks()
+    if qb is None:
+        qb = QuickBooks()
 
-	cdc_class_dict = dict((cls.qbo_object_name, cls) for cls in qbo_class_list)
+    cdc_class_dict = dict((cls.qbo_object_name, cls) for cls in qbo_class_list)
 
-	cdc_class_names = list(cdc_class_dict.keys())
-	entity_list_string = ','.join(cdc_class_names)
+    cdc_class_names = list(cdc_class_dict.keys())
+    entity_list_string = ','.join(cdc_class_names)
 
-	if isinstance(timestamp, datetime):
-		timestamp_string = qb_datetime_format(timestamp)
-	else:
-		timestamp_string = timestamp
+    if isinstance(timestamp, datetime):
+        timestamp_string = qb_datetime_format(timestamp)
+    else:
+        timestamp_string = timestamp
 
-	resp = qb.change_data_capture(entity_list_string, timestamp_string)
+    resp = qb.change_data_capture(entity_list_string, timestamp_string)
 
-	cdc_response_dict = resp.pop('CDCResponse')
-	cdc_response = CDCResponse.from_json(resp)
+    cdc_response_dict = resp.pop('CDCResponse')
+    cdc_response = CDCResponse.from_json(resp)
 
-	query_response_list = cdc_response_dict[0]['QueryResponse']
-	for query_response_dict in query_response_list:
-		qb_object_name = [x for x in query_response_dict if x in cdc_class_names][0]
-		qb_object_list = query_response_dict.pop(qb_object_name)
-		qb_object_cls = cdc_class_dict[qb_object_name]
+    query_response_list = cdc_response_dict[0]['QueryResponse']
+    for query_response_dict in query_response_list:
+        qb_object_name = [x for x in query_response_dict if x in cdc_class_names][0]
+        qb_object_list = query_response_dict.pop(qb_object_name)
+        qb_object_cls = cdc_class_dict[qb_object_name]
 
-		query_response = QueryResponse.from_json(query_response_dict)
-		query_response._object_list = [qb_object_cls.from_json(obj) for obj in qb_object_list]
+        query_response = QueryResponse.from_json(query_response_dict)
+        query_response._object_list = [qb_object_cls.from_json(obj) for obj in qb_object_list]
 
-		setattr(cdc_response, qb_object_name, query_response)
+        setattr(cdc_response, qb_object_name, query_response)
 
-	return cdc_response
+    return cdc_response
diff --git a/quickbooks/client.py b/quickbooks/client.py
@@ -149,7 +149,7 @@ def create_session(self):
             self.session = session
         else:
             raise QuickbooksException(
-                "Quickbooks authenication fields not set. Cannot create session.")
+                "Quickbooks authentication fields not set. Cannot create session.")
 
         return self.session
 
diff --git a/quickbooks/objects/item.py b/quickbooks/objects/item.py
@@ -39,12 +39,12 @@ def __init__(self):
         self.SubItem = False
         self.FullyQualifiedName = ""  # Readonly
         self.Taxable = False
-        self.SalesTaxInclusive = None
+        self.SalesTaxIncluded = None
         self.UnitPrice = 0
         self.Type = ""
         self.Level = None  # Readonly
         self.PurchaseDesc = None
-        self.PurchaseTaxInclusive = None
+        self.PurchaseTaxIncluded = None
         self.PurchaseCost = None
         self.TrackQtyOnHand = False
         self.QtyOnHand = None
diff --git a/quickbooks/utils.py b/quickbooks/utils.py
@@ -1,4 +1,5 @@
 import six
+import sys
 
 
 def build_where_clause(**kwargs):
@@ -8,7 +9,11 @@ def build_where_clause(**kwargs):
         where = []
 
         for key, value in kwargs.items():
-            if isinstance(value, six.string_types):
+            if isinstance(value, six.text_type) and sys.version_info[0] == 2:
+                # If using python 2, encode unicode as string.
+                encoded_value = value.encode('utf-8')
+                where.append("{0} = '{1}'".format(key, encoded_value.replace(r"'", r"\'")))
+            elif isinstance(value, six.string_types):
                 where.append("{0} = '{1}'".format(key, value.replace(r"'", r"\'")))
             else:
                 where.append("{0} = {1}".format(key, value))
@@ -25,7 +30,11 @@ def build_choose_clause(choices, field):
         where = []
 
         for choice in choices:
-            if isinstance(choice, six.string_types):
+            if isinstance(choice, six.text_type) and sys.version_info[0] == 2:
+                # If using python 2, encode unicode as string.
+                encoded_choice = choice.encode('utf-8')
+                where.append("'{0}'".format(encoded_choice.replace(r"'", r"\'")))
+            elif isinstance(choice, six.string_types):
                 where.append("'{0}'".format(choice.replace(r"'", r"\'")))
             else:
                 where.append("{0}".format(choice))
diff --git a/tests/integration/test_attachable.py b/tests/integration/test_attachable.py
@@ -1,4 +1,5 @@
 import os
+import tempfile
 import unittest
 from datetime import datetime
 
@@ -55,16 +56,17 @@ def test_update_note(self):
 
     def test_create_file(self):
         attachable = Attachable()
+        test_file = tempfile.NamedTemporaryFile(suffix=".txt")
 
         vendor = Vendor.all(max_results=1, qb=self.qb_client)[0]
 
         attachable_ref = AttachableRef()
         attachable_ref.EntityRef = vendor.to_ref()
         attachable.AttachableRef.append(attachable_ref)
 
-        attachable.FileName = 'TestFileName'
-        attachable._FilePath = __file__
-        attachable.ContentType = 'application/txt'
+        attachable.FileName = os.path.basename(test_file.name)
+        attachable._FilePath = test_file.name
+        attachable.ContentType = 'text/plain'
 
         attachable.save(qb=self.qb_client)
         query_attachable = Attachable.get(attachable.Id, qb=self.qb_client)
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -4,22 +4,46 @@
 
 class UtilsTests(unittest.TestCase):
     def test_build_where_clause(self):
-        where_clause = utils.build_where_clause(field1=1, field2="Someone's Company")
+        where_clause = utils.build_where_clause(field1=1,
+                                                field2="Someone's Company")
 
         self.assertTrue("field1 = 1" in where_clause)
         self.assertTrue("field2 = 'Someone\\\'s Company'" in where_clause)
 
-    def test_build_where_clause_integers(self):
-        where_clause = utils.build_choose_clause(choices=[1, 2], field="field1")
+    def test_build_where_clause_unicode(self):
+        where_clause = utils.build_where_clause(field1=u"Test 1",
+                                                field2=u"Someone's Company")
+
+        self.assertTrue("field1 = 'Test 1'" in where_clause)
+        self.assertTrue("field2 = 'Someone\\\'s Company'" in where_clause)
+
+    def test_build_choose_clause_integers(self):
+        where_clause = utils.build_choose_clause(choices=[1, 2],
+                                                 field="field1")
 
         self.assertEqual(where_clause, "field1 in (1, 2)")
 
-    def test_build_where_clause_strings(self):
-        where_clause = utils.build_choose_clause(choices=["val1", "val2"], field="field1")
+    def test_build_choose_clause_strings(self):
+        where_clause = utils.build_choose_clause(choices=["val1", "val2"],
+                                                 field="field1")
 
         self.assertEqual(where_clause, "field1 in ('val1', 'val2')")
 
-    def test_build_where_clause_quoted_value(self):
-        where_clause = utils.build_choose_clause(choices=["val1", "Someone's Company"], field="field1")
+    def test_build_choose_clause_quoted_value(self):
+        where_clause = utils.build_choose_clause(choices=["val1",
+                                                          "Someone's Company"],
+                                                 field="field1")
 
         self.assertEqual(where_clause, "field1 in ('val1', 'Someone\\\'s Company')")
+
+    def test_build_choose_clause_unicode(self):
+        where_clause = utils.build_choose_clause(choices=[u"Test - & % $", u"Another Test"],
+                                                 field="field1")
+
+        self.assertEqual(where_clause, "field1 in ('Test - & % $', 'Another Test')")
+
+    def test_build_choose_clause_unicode_escaped(self):
+        where_clause = utils.build_choose_clause(choices=[u"Test - & % $", u"Another's Test"],
+                                                 field="field1")
+
+        self.assertEqual(where_clause, "field1 in ('Test - & % $', 'Another\\\'s Test')")
