6 files changed, 30 insertions, 32 deletions
diff --git a/doc/examples/recordset_create.py b/doc/examples/recordset_create.py
index 1bad60f..4be7c4d 100644
--- a/doc/examples/recordset_create.py
+++ b/doc/examples/recordset_create.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import logging
+import os
 
 from designateclient.v2 import client
 from designateclient import exceptions
-from designateclient import shell
 
 from keystoneauth1.identity import generic
 from keystoneauth1 import session as keystone_session
@@ -17,10 +17,10 @@ Example script to create or get a domain and add some records to it.
 
 
 auth = generic.Password(
-    auth_url=shell.env('OS_AUTH_URL'),
-    username=shell.env('OS_USERNAME'),
-    password=shell.env('OS_PASSWORD'),
-    project_name=shell.env('OS_PROJECT_NAME'),
+    auth_url=os.environ.get('OS_AUTH_URL'),
+    username=os.environ.get('OS_USERNAME'),
+    password=os.environ.get('OS_PASSWORD'),
+    project_name=os.environ.get('OS_PROJECT_NAME'),
     project_domain_id='default',
     user_domain_id='default')
 
diff --git a/doc/examples/recordset_crud.py b/doc/examples/recordset_crud.py
index f00e41e..6b09197 100644
--- a/doc/examples/recordset_crud.py
+++ b/doc/examples/recordset_crud.py
@@ -1,8 +1,8 @@
 import logging
+import os
 
 from designateclient.v2 import client
 from designateclient import exceptions
-from designateclient import shell
 
 from keystoneauth1.identity import generic
 from keystoneauth1 import session as keystone_session
@@ -11,10 +11,10 @@ from keystoneauth1 import session as keystone_session
 logging.basicConfig(level='DEBUG')
 
 auth = generic.Password(
-    auth_url=shell.env('OS_AUTH_URL'),
-    username=shell.env('OS_USERNAME'),
-    password=shell.env('OS_PASSWORD'),
-    project_name=shell.env('OS_PROJECT_NAME'),
+    auth_url=os.environ.get('OS_AUTH_URL'),
+    username=os.environ.get('OS_USERNAME'),
+    password=os.environ.get('OS_PASSWORD'),
+    project_name=os.environ.get('OS_PROJECT_NAME'),
     project_domain_id='default',
     user_domain_id='default')
 
diff --git a/doc/examples/zone_create_primary.py b/doc/examples/zone_create_primary.py
index 91d822c..2ebc404 100644
--- a/doc/examples/zone_create_primary.py
+++ b/doc/examples/zone_create_primary.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 
 import logging
+import os
 
 from designateclient import exceptions
-from designateclient import shell
 from designateclient.v2 import client
 
 from keystoneauth1.identity import generic
@@ -13,10 +13,10 @@ from keystoneauth1 import session as keystone_session
 logging.basicConfig(level='DEBUG')
 
 auth = generic.Password(
-    auth_url=shell.env('OS_AUTH_URL'),
-    username=shell.env('OS_USERNAME'),
-    password=shell.env('OS_PASSWORD'),
-    project_name=shell.env('OS_PROJECT_NAME'),
+    auth_url=os.environ.get('OS_AUTH_URL'),
+    username=os.environ.get('OS_USERNAME'),
+    password=os.environ.get('OS_PASSWORD'),
+    project_name=os.environ.get('OS_PROJECT_NAME'),
     project_domain_id='default',
     user_domain_id='default')
 
diff --git a/doc/examples/zone_create_secondary.py b/doc/examples/zone_create_secondary.py
index 876d1ba..febbe90 100644
--- a/doc/examples/zone_create_secondary.py
+++ b/doc/examples/zone_create_secondary.py
@@ -1,21 +1,20 @@
 import logging
+import os
 import uuid
 
 from keystoneauth1.identity import generic
 from keystoneauth1 import session as keystone_session
 
-from designateclient import exceptions
-from designateclient import shell
 from designateclient.v2 import client
 
 
 logging.basicConfig(level='DEBUG')
 
 auth = generic.Password(
-    auth_url=shell.env('OS_AUTH_URL'),
-    username=shell.env('OS_USERNAME'),
-    password=shell.env('OS_PASSWORD'),
-    project_name=shell.env('OS_PROJECT_NAME'),
+    auth_url=os.environ.get('OS_AUTH_URL'),
+    username=os.environ.get('OS_USERNAME'),
+    password=os.environ.get('OS_PASSWORD'),
+    project_name=os.environ.get('OS_PROJECT_NAME'),
     project_domain_id='default',
     user_domain_id='default')
 
diff --git a/doc/examples/zone_list_nameservers.py b/doc/examples/zone_list_nameservers.py
index 1ee4f8e..b1136e7 100644
--- a/doc/examples/zone_list_nameservers.py
+++ b/doc/examples/zone_list_nameservers.py
@@ -1,9 +1,8 @@
 import logging
+import os
 import uuid
 
 from designateclient.v2 import client
-from designateclient import shell
-from designateclient import utils
 
 from keystoneauth1.identity import generic
 from keystoneauth1 import session as keystone_session
@@ -12,10 +11,10 @@ from keystoneauth1 import session as keystone_session
 logging.basicConfig(level='DEBUG')
 
 auth = generic.Password(
-    auth_url=shell.env('OS_AUTH_URL'),
-    username=shell.env('OS_USERNAME'),
-    password=shell.env('OS_PASSWORD'),
-    project_name=shell.env('OS_PROJECT_NAME'),
+    auth_url=os.environ.get('OS_AUTH_URL'),
+    username=os.environ.get('OS_USERNAME'),
+    password=os.environ.get('OS_PASSWORD'),
+    project_name=os.environ.get('OS_PROJECT_NAME'),
     project_domain_id='default',
     user_domain_id='default')
 
diff --git a/doc/examples/zone_list_paging.py b/doc/examples/zone_list_paging.py
index f62f6d9..e16227b 100644
--- a/doc/examples/zone_list_paging.py
+++ b/doc/examples/zone_list_paging.py
@@ -1,19 +1,19 @@
 from __future__ import print_function
 import logging
+import os
 
 from keystoneauth1.identity import generic
 from keystoneauth1 import session as keystone_session
 
-from designateclient import shell
 from designateclient.v2 import client
 
 logging.basicConfig(level='DEBUG')
 
 auth = generic.Password(
-    auth_url=shell.env('OS_AUTH_URL'),
-    username=shell.env('OS_USERNAME'),
-    password=shell.env('OS_PASSWORD'),
-    project_name=shell.env('OS_PROJECT_NAME'),
+    auth_url=os.environ.get('OS_AUTH_URL'),
+    username=os.environ.get('OS_USERNAME'),
+    password=os.environ.get('OS_PASSWORD'),
+    project_name=os.environ.get('OS_PROJECT_NAME'),
     project_domain_id='default',
     user_domain_id='default')