tidy up imports and some other small changes.

Author: Ian-Nara

examples/sample_auto_refresh.py

@@ -3,8 +3,8 @@
 import time
 
 from uid2_client import EncryptionKeysAutoRefresher
-from uid2_client.euid_client_factory import EuidClientFactory
-from uid2_client.uid2_client_factory import Uid2ClientFactory
+from uid2_client import EuidClientFactory
+from uid2_client import Uid2ClientFactory
 
 
 def _usage():

examples/sample_encryption.py

@@ -21,7 +21,7 @@ def _usage():
 ad_token = sys.argv[4]
 str_data = sys.argv[5]
 
-client = Uid2Client(base_url, auth_key, secret_key, IdentityScope.UID2)
+client = Uid2Client(base_url, auth_key, secret_key)
 keys = client.refresh_keys()
 
 data = bytes(str_data, 'utf-8')

examples/sample_sharing.py

@@ -1,7 +1,7 @@
 import sys
 
-from uid2_client.euid_client_factory import EuidClientFactory
-from uid2_client.uid2_client_factory import Uid2ClientFactory
+from uid2_client import EuidClientFactory
+from uid2_client import Uid2ClientFactory
 
 
 # this sample client encrypts and decrypts a uid2 to a sharing token

uid2_client/__init__.py

@@ -12,5 +12,7 @@
 from .client import *
 from .encryption import *
 from .keys import *
+from .euid_client_factory import *
+from .uid2_client_factory import *
 
 

uid2_client/client.py

@@ -47,7 +47,6 @@ def __init__(self, base_url, auth_key, secret_key):
             base_url (str): base URL for all requests to UID2 services (e.g. 'https://prod.uidapi.com')
             auth_key (str): authorization key for consuming the UID2 services
             secret_key (str): secret key for consuming the UID2 services
-            identity_scope (IdentityScope): UID2 or EUID
 
         Note:
             Your authorization key will determine which UID2 services you are allowed to use.