From bcd73c1bb7d684c1103d9d0c7dcde272e94879ea Mon Sep 17 00:00:00 2001
From: Charley Peng <masterchid@gmail.com>
Date: Tue, 16 Aug 2016 06:05:07 +1000
Subject: [PATCH 1/6] Update README.md (#71)

CLANotRequired
---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a6534d2..588fb14 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Features include:
   - Database Name
 - Getting Field information from data sources and workbooks
   - Get all fields in a data source
-  - Get all feilds in use by certain sheets in a workbook
+  - Get all fields in use by certain sheets in a workbook
 
 We don't yet support creating files from scratch, adding extracts into workbooks or data sources, or updating field information
 
@@ -45,7 +45,7 @@ Download the `.zip` file that contains the SDK. Unzip the file and then run the
 pip install -e <directory containing setup.py>
 ```
 
-#### Installing the Development Version From Git
+#### Installing the Development Version from Git
 
 *Only do this if you know you want the development version, no guarantee that we won't break APIs during development*
 
@@ -74,7 +74,7 @@ sourceWB.datasources[0].connections[0].username = "benl"
 sourceWB.save()
 ```
 
-With Data Integration in Tableau 10, a data source can have multiple connections. To access the connections simply index them like you would datasources
+With Data Integration in Tableau 10, a data source can have multiple connections. To access the connections simply index them like you would datasources.
 
 ```python
 from tableaudocumentapi import Workbook
@@ -104,6 +104,6 @@ sourceWB.save()
 
 
 
-###Examples
+###[Examples](Examples)
 
-The downloadable package contains several example scripts that show more detailed usage of the Document API
+The downloadable package contains several example scripts that show more detailed usage of the Document API.

From b37d999593bc61c626988845339993bc575f5f6a Mon Sep 17 00:00:00 2001
From: Russell Hay <RussTheAerialist@users.noreply.github.com>
Date: Thu, 8 Sep 2016 15:11:38 -0700
Subject: [PATCH 2/6] Update setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 27d6a73..998914e 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 setup(
     name='tableaudocumentapi',
     version='0.3',
-    author='Tableau Software',
+    author='Tableau',
     author_email='github@tableau.com',
     url='https://github.com/tableau/document-api-python',
     packages=['tableaudocumentapi'],

From fed0de3d31076f689f0fb7fef68af32bacb9d47d Mon Sep 17 00:00:00 2001
From: Tyler Doyle <t8y8@users.noreply.github.com>
Date: Tue, 13 Sep 2016 14:00:24 -0700
Subject: [PATCH 3/6] Scrub some strings in the test files (#82)

* Scrub some strings in the test file so they don't include internal references
* Updated some of the assets to be consistent in casing
---
 test/assets/CONNECTION.xml     |  2 +-
 test/assets/TABLEAU_10_TDS.tds |  2 +-
 test/bvt.py                    | 44 +++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/assets/CONNECTION.xml b/test/assets/CONNECTION.xml
index 392d112..6cce11f 100644
--- a/test/assets/CONNECTION.xml
+++ b/test/assets/CONNECTION.xml
@@ -1 +1 @@
-<connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username=''></connection>
+<connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012' username=''></connection>
diff --git a/test/assets/TABLEAU_10_TDS.tds b/test/assets/TABLEAU_10_TDS.tds
index 7a81784..01fe7c3 100644
--- a/test/assets/TABLEAU_10_TDS.tds
+++ b/test/assets/TABLEAU_10_TDS.tds
@@ -1 +1 @@
-<?xml version='1.0' encoding='utf-8' ?><datasource caption='xy+ (Multiple Connections)' inline='true' name='federated.1s4nxn20cywkdv13ql0yk0g1mpdx' version='10.0'><connection class='federated'><named-connections><named-connection caption='mysql55.test.tsi.lan' name='mysql.1ewmkrw0mtgsev1dnurma1blii4x'><connection class='mysql' dbname='testv1' odbc-native-protocol='yes' port='3306' server='mysql55.test.tsi.lan' source-charset='' username='test' /></named-connection><named-connection caption='mssql2012.test.tsi.lan' name='sqlserver.1erdwp01uqynlb14ul78p0haai2r'><connection authentication='sqlserver' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username='test' /></named-connection></named-connections></connection></datasource>
+<?xml version='1.0' encoding='utf-8' ?><datasource caption='xy+ (Multiple Connections)' inline='true' name='federated.1s4nxn20cywkdv13ql0yk0g1mpdx' version='10.0'><connection class='federated'><named-connections><named-connection caption='mysql55' name='mysql.1ewmkrw0mtgsev1dnurma1blii4x'><connection class='mysql' dbname='TestV1' odbc-native-protocol='yes' port='3306' server='mysql55' source-charset='' username='test' /></named-connection><named-connection caption='mssql2012' name='sqlserver.1erdwp01uqynlb14ul78p0haai2r'><connection authentication='sqlserver' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012' username='test' /></named-connection></named-connections></connection></datasource>
diff --git a/test/bvt.py b/test/bvt.py
index 4ea3d11..60e42c3 100644
--- a/test/bvt.py
+++ b/test/bvt.py
@@ -42,7 +42,7 @@ def test_can_extract_federated_connections(self):
         connections = parser.get_connections()
         self.assertIsInstance(connections, list)
         self.assertIsInstance(connections[0], Connection)
-        self.assertEqual(connections[0].dbname, 'testv1')
+        self.assertEqual(connections[0].dbname, 'TestV1')
 
 
 class ConnectionModelTests(unittest.TestCase):
@@ -54,18 +54,18 @@ def test_can_read_attributes_from_connection(self):
         conn = Connection(self.connection)
         self.assertEqual(conn.dbname, 'TestV1')
         self.assertEqual(conn.username, '')
-        self.assertEqual(conn.server, 'mssql2012.test.tsi.lan')
+        self.assertEqual(conn.server, 'mssql2012')
         self.assertEqual(conn.dbclass, 'sqlserver')
         self.assertEqual(conn.authentication, 'sspi')
 
     def test_can_write_attributes_to_connection(self):
         conn = Connection(self.connection)
         conn.dbname = 'BubblesInMyDrink'
-        conn.server = 'mssql2014.test.tsi.lan'
+        conn.server = 'mssql2014'
         conn.username = 'bob'
         self.assertEqual(conn.dbname, 'BubblesInMyDrink')
         self.assertEqual(conn.username, 'bob')
-        self.assertEqual(conn.server, 'mssql2014.test.tsi.lan')
+        self.assertEqual(conn.server, 'mssql2014')
 
     def test_bad_dbclass_rasies_attribute_error(self):
         conn = Connection(self.connection)
@@ -117,15 +117,15 @@ def test_can_extract_connection(self):
 
     def test_can_save_tds(self):
         original_tds = Datasource.from_file(self.tds_file.name)
-        original_tds.connections[0].dbname = 'newdb.test.tsi.lan'
+        original_tds.connections[0].dbname = 'newdb'
         original_tds.save()
 
         new_tds = Datasource.from_file(self.tds_file.name)
-        self.assertEqual(new_tds.connections[0].dbname, 'newdb.test.tsi.lan')
+        self.assertEqual(new_tds.connections[0].dbname, 'newdb')
 
     def test_save_has_xml_declaration(self):
         original_tds = Datasource.from_file(self.tds_file.name)
-        original_tds.connections[0].dbname = 'newdb.test.tsi.lan'
+        original_tds.connections[0].dbname = 'newdb'
 
         original_tds.save()
 
@@ -158,11 +158,11 @@ def test_can_extract_connection(self):
 
     def test_can_save_tds(self):
         original_tds = Datasource.from_file(self.tds_file.name)
-        original_tds.connections[0].dbname = 'newdb.test.tsi.lan'
+        original_tds.connections[0].dbname = 'newdb'
         original_tds.save()
 
         new_tds = Datasource.from_file(self.tds_file.name)
-        self.assertEqual(new_tds.connections[0].dbname, 'newdb.test.tsi.lan')
+        self.assertEqual(new_tds.connections[0].dbname, 'newdb')
 
 
 class DatasourceModelV10TDSXTests(unittest.TestCase):
@@ -183,22 +183,22 @@ def test_can_open_tdsx(self):
 
     def test_can_open_tdsx_and_save_changes(self):
         original_tdsx = Datasource.from_file(self.tdsx_file.name)
-        original_tdsx.connections[0].server = 'newdb.test.tsi.lan'
+        original_tdsx.connections[0].server = 'newdb'
         original_tdsx.save()
 
         new_tdsx = Datasource.from_file(self.tdsx_file.name)
         self.assertEqual(new_tdsx.connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
 
     def test_can_open_tdsx_and_save_as_changes(self):
         new_tdsx_filename = 'newtdsx.tdsx'
         original_wb = Datasource.from_file(self.tdsx_file.name)
-        original_wb.connections[0].server = 'newdb.test.tsi.lan'
+        original_wb.connections[0].server = 'newdb'
         original_wb.save_as(new_tdsx_filename)
 
         new_wb = Datasource.from_file(new_tdsx_filename)
         self.assertEqual(new_wb.connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
         os.unlink(new_tdsx_filename)
 
 
@@ -230,12 +230,12 @@ def test_has_filename(self):
 
     def test_can_update_datasource_connection_and_save(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].dbname = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].dbname = 'newdb'
         original_wb.save()
 
         new_wb = Workbook(self.workbook_file.name)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].dbname, 'newdb.test.tsi.lan')
+                         0].dbname, 'newdb')
 
 
 class WorkbookModelV10Tests(unittest.TestCase):
@@ -260,17 +260,17 @@ def test_can_extract_datasourceV10(self):
 
     def test_can_update_datasource_connection_and_saveV10(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].dbname = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].dbname = 'newdb'
 
         original_wb.save()
 
         new_wb = Workbook(self.workbook_file.name)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].dbname, 'newdb.test.tsi.lan')
+                         0].dbname, 'newdb')
 
     def test_save_has_xml_declaration(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].dbname = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].dbname = 'newdb'
 
         original_wb.save()
 
@@ -298,22 +298,22 @@ def test_can_open_twbx(self):
 
     def test_can_open_twbx_and_save_changes(self):
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].server = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].server = 'newdb'
         original_wb.save()
 
         new_wb = Workbook(self.workbook_file.name)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
 
     def test_can_open_twbx_and_save_as_changes(self):
         new_twbx_filename = 'newtwbx.twbx'
         original_wb = Workbook(self.workbook_file.name)
-        original_wb.datasources[0].connections[0].server = 'newdb.test.tsi.lan'
+        original_wb.datasources[0].connections[0].server = 'newdb'
         original_wb.save_as(new_twbx_filename)
 
         new_wb = Workbook(new_twbx_filename)
         self.assertEqual(new_wb.datasources[0].connections[
-                         0].server, 'newdb.test.tsi.lan')
+                         0].server, 'newdb')
 
         os.unlink(new_twbx_filename)
 

From 6c81acb4a358911564f4dd5f8aede29d0541d769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20S=C3=A1nchez?= <miguelsr87@gmail.com>
Date: Mon, 19 Sep 2016 17:59:42 +0200
Subject: [PATCH 4/6] Fix encoding bugs in Python2 (non-ASCII characters) (#80)

---
 tableaudocumentapi/datasource.py | 2 +-
 tableaudocumentapi/field.py      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tableaudocumentapi/datasource.py b/tableaudocumentapi/datasource.py
index dd3d5c5..69318ed 100644
--- a/tableaudocumentapi/datasource.py
+++ b/tableaudocumentapi/datasource.py
@@ -31,7 +31,7 @@
 def _get_metadata_xml_for_field(root_xml, field_name):
     if "'" in field_name:
         field_name = sax.escape(field_name, {"'": "&apos;"})
-    xpath = ".//metadata-record[@class='column'][local-name='{}']".format(field_name)
+    xpath = u".//metadata-record[@class='column'][local-name='{}']".format(field_name)
     return root_xml.find(xpath)
 
 
diff --git a/tableaudocumentapi/field.py b/tableaudocumentapi/field.py
index 63cc72c..65ce78d 100644
--- a/tableaudocumentapi/field.py
+++ b/tableaudocumentapi/field.py
@@ -199,4 +199,9 @@ def _read_description(xmldata):
         if description is None:
             return None
 
-        return u'{}'.format(ET.tostring(description, encoding='utf-8'))  # This is necessary for py3 support
+        description_string = ET.tostring(description, encoding='utf-8')
+        # Format expects a unicode string so in Python 2 we have to do the explicit conversion
+        if isinstance(description_string, bytes):
+            description_string = description_string.decode('utf-8')
+
+        return description_string

From 6099ba77bb08525ebafac3b30cfdc3ceda45f221 Mon Sep 17 00:00:00 2001
From: Russell Hay <me@russellhay.com>
Date: Mon, 19 Sep 2016 09:05:01 -0700
Subject: [PATCH 5/6] Add test to keep #80 from happening again

---
 test/assets/unicode.tds | 93 +++++++++++++++++++++++++++++++++++++++++
 test/test_field.py      | 10 +++++
 2 files changed, 103 insertions(+)
 create mode 100644 test/assets/unicode.tds

diff --git a/test/assets/unicode.tds b/test/assets/unicode.tds
new file mode 100644
index 0000000..6c6e764
--- /dev/null
+++ b/test/assets/unicode.tds
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<datasource formatted-name='postgres.1of3kl00aoax5d1a1ejma1397430' inline='true' source-platform='mac' version='9.3' xmlns:user='http://www.tableausoftware.com/xml/user'>
+  <connection authentication='username-password' class='postgres' dbname='TestV1' odbc-native-protocol='yes' port='5432' server='postgres91.test.tsi.lan' username='test'>
+    <relation name='xy' table='[public].[xy]' type='table' />
+    <metadata-records>
+      <metadata-record class='column'>
+        <remote-name>a</remote-name>
+        <remote-type>130</remote-type>
+        <local-name>[a]</local-name>
+        <parent-name>[xy]</parent-name>
+        <remote-alias>a</remote-alias>
+        <ordinal>1</ordinal>
+        <local-type>string</local-type>
+        <aggregation>Count</aggregation>
+        <width>255</width>
+        <contains-null>true</contains-null>
+        <attributes>
+          <attribute datatype='string' name='DebugRemoteType'>&quot;SQL_WVARCHAR&quot;</attribute>
+          <attribute datatype='string' name='DebugWireType'>&quot;SQL_C_WCHAR&quot;</attribute>
+          <attribute datatype='string' name='TypeIsVarchar'>&quot;true&quot;</attribute>
+        </attributes>
+      </metadata-record>
+      <metadata-record class='column'>
+        <remote-name>Today's Date</remote-name>
+        <remote-type>130</remote-type>
+        <local-name>[Today&apos;s Date]</local-name>
+        <parent-name>[xy]</parent-name>
+        <remote-alias>a</remote-alias>
+        <ordinal>1</ordinal>
+        <local-type>string</local-type>
+        <aggregation>Count</aggregation>
+        <width>255</width>
+        <contains-null>true</contains-null>
+        <attributes>
+          <attribute datatype='string' name='DebugRemoteType'>&quot;SQL_WVARCHAR&quot;</attribute>
+          <attribute datatype='string' name='DebugWireType'>&quot;SQL_C_WCHAR&quot;</attribute>
+          <attribute datatype='string' name='TypeIsVarchar'>&quot;true&quot;</attribute>
+        </attributes>
+      </metadata-record>
+      <metadata-record class='column'>
+        <remote-name>x</remote-name>
+        <remote-type>3</remote-type>
+        <local-name>[x]</local-name>
+        <parent-name>[xy]</parent-name>
+        <remote-alias>x</remote-alias>
+        <ordinal>2</ordinal>
+        <local-type>integer</local-type>
+        <aggregation>Sum</aggregation>
+        <precision>10</precision>
+        <contains-null>true</contains-null>
+        <attributes>
+          <attribute datatype='string' name='DebugRemoteType'>&quot;SQL_INTEGER&quot;</attribute>
+          <attribute datatype='string' name='DebugWireType'>&quot;SQL_C_SLONG&quot;</attribute>
+        </attributes>
+      </metadata-record>
+      <metadata-record class='column'>
+        <remote-name>y</remote-name>
+        <remote-type>3</remote-type>
+        <local-name>[y]</local-name>
+        <parent-name>[xy]</parent-name>
+        <remote-alias>y</remote-alias>
+        <ordinal>3</ordinal>
+        <local-type>integer</local-type>
+        <aggregation>Sum</aggregation>
+        <precision>10</precision>
+        <contains-null>true</contains-null>
+        <attributes>
+          <attribute datatype='string' name='DebugRemoteType'>&quot;SQL_INTEGER&quot;</attribute>
+          <attribute datatype='string' name='DebugWireType'>&quot;SQL_C_SLONG&quot;</attribute>
+        </attributes>
+      </metadata-record>
+    </metadata-records>
+  </connection>
+  <aliases enabled='yes' />
+  <column datatype='integer' name='[Number of Records]' role='measure' type='quantitative' user:auto-column='numrec'>
+    <calculation class='tableau' formula='1' />
+  </column>
+  <column caption='A' datatype='string' name='[a]' role='dimension' type='nominal'>
+    <desc>
+      <formatted-text>
+        <run bold='true' fontsize='96'>año</run>
+        <run fontcolor='#686868'>&#10;Something will go here too, in a muted gray</run>
+      </formatted-text>
+    </desc>
+  </column>
+  <column caption='Today&apos;s Date' datatype='string' name='[Today&apos;s Date]' role='dimension' type='nominal' />
+  <column caption='X' datatype='integer' name='[x]' role='measure' type='ordinal' />
+  <column caption='Y' datatype='integer' name='[y]' role='measure' type='quantitative' />
+  <layout dim-ordering='alphabetic' dim-percentage='0.5' measure-ordering='alphabetic' measure-percentage='0.5' show-structure='true' />
+  <semantic-values>
+    <semantic-value key='[Country].[Name]' value='&quot;United States&quot;' />
+  </semantic-values>
+</datasource>
diff --git a/test/test_field.py b/test/test_field.py
index 7cbe885..a94cfb2 100644
--- a/test/test_field.py
+++ b/test/test_field.py
@@ -12,6 +12,10 @@
     TEST_ASSET_DIR,
     'datasource_test.tds'
 )
+TEST_UNICODE_FILE = os.path.join(
+    TEST_ASSET_DIR,
+    'unicode.tds'
+)
 
 
 class FieldsUnitTest(unittest.TestCase):
@@ -27,3 +31,9 @@ def find(self, *args, **kwargs):
 
     def test_find_metadata_record_returns_none(self):
         self.assertIsNone(_find_metadata_record(self.MockXmlWithNoFind(), 'foo'))
+
+
+class FieldsHandleUnicode(unittest.TestCase):
+    def test_description_unicode(self):
+        ds = Datasource.from_file(TEST_UNICODE_FILE)
+        self.assertIsNotNone(ds.fields['A'].description)
\ No newline at end of file

From b4db97bbc830670b8e051f1c235e5b62fbeee2e9 Mon Sep 17 00:00:00 2001
From: Russell Hay <me@russellhay.com>
Date: Mon, 19 Sep 2016 09:53:07 -0700
Subject: [PATCH 6/6] Fixing pep8 issue with missing eol

---
 test/test_field.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_field.py b/test/test_field.py
index a94cfb2..b222e81 100644
--- a/test/test_field.py
+++ b/test/test_field.py
@@ -36,4 +36,4 @@ def test_find_metadata_record_returns_none(self):
 class FieldsHandleUnicode(unittest.TestCase):
     def test_description_unicode(self):
         ds = Datasource.from_file(TEST_UNICODE_FILE)
-        self.assertIsNotNone(ds.fields['A'].description)
\ No newline at end of file
+        self.assertIsNotNone(ds.fields['A'].description)

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/tableau/document-api-python/pull/83.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/tableau/document-api-python/pull/83.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/tableau/document-api-python/pull/83.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/tableau/document-api-python/pull/83.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>