fix sample login

add string method for server_info_item, remove print statement from server

Author: jacalata

samples/login.py

@@ -23,7 +23,9 @@ def set_up_and_log_in():
     logging_level = getattr(logging, args.logging_level.upper())
     logging.basicConfig(level=logging_level)
 
-    return sample_connect_to_server()
+    server = sample_connect_to_server(args)
+    print(server.server_info.get())
+    print(server.server_address, "site:", server.site_id, "user:", server.user_id)
 
 
 def sample_define_common_options(parser):
@@ -76,10 +78,11 @@ def sample_connect_to_server(args):
 
     # Only set this to False if you are running against a server you trust AND you know why the cert is broken
     check_ssl_certificate = True
-    # Make sure we use an updated version of the rest apis.
-    server = TSC.Server(args.server, use_server_version=True, http_options={'verify', check_ssl_certificate})
-    with server.auth.sign_in(tableau_auth):
-        print("Logged in successfully")
+
+    # Make sure we use an updated version of the rest apis, and pass in our cert handling choice
+    server = TSC.Server(args.server, use_server_version=True, http_options={'verify': check_ssl_certificate})
+    server.auth.sign_in(tableau_auth)
+    print("Logged in successfully")
 
     return server
 

tableauserverclient/models/server_info_item.py

@@ -7,6 +7,10 @@ def __init__(self, product_version, build_number, rest_api_version):
         self._build_number = build_number
         self._rest_api_version = rest_api_version
 
+    def __str__(self):
+        return "ServerInfoItem: [product version: " + self._product_version + ", build no.:" + self._build_number + \
+               ", REST API version:" + self.rest_api_version + "]"
+
     @property
     def product_version(self):
         return self._product_version

tableauserverclient/server/server.py

@@ -1,5 +1,5 @@
 from distutils.version import LooseVersion as Version
-
+import urllib3
 import requests
 from defusedxml.ElementTree import fromstring
 
@@ -35,7 +35,7 @@
 )
 from .exceptions import NotSignedInError
 from ..namespace import Namespace
-import urllib3
+
 
 _PRODUCT_TO_REST_VERSION = {
     "10.0": "2.3",
@@ -45,6 +45,7 @@
     "9.0": "2.0",
 }
 
+
 class Server(object):
     class PublishMode:
         Append = "Append"
@@ -93,7 +94,6 @@ def __init__(self, server_address, use_server_version=True, http_options=None):
             self.use_server_version()
 
     def add_http_options(self, options_dict):
-        print(options_dict)
         self._http_options.update(options_dict)
         if options_dict.get('verify') == False:
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)