Refactor: move creation of Session() object to a method

1 files changed, 9 insertions, 12 deletions

diff --git a/effitool b/effitool
index c7ffaa6..8500edf 100755
--- a/effitool
+++ b/effitool
@@ -238,6 +238,12 @@ class Tool:
     def __init__(self, config):
         self._config = config
 
+    def get_session(self, args):
+        server = self.get_chosen_server(args)
+        token = self.get_admin_token(server)
+        api = HTTPAPI(server['url'])
+        return Session(api, token)
+
     def servers(self):
         return self._config.servers()
 
@@ -350,10 +356,7 @@ class Tool:
         api.post_json(token, '/memb', memb)
 
     def show_member(self, args):
-        server = self.get_chosen_server(args)
-        token = self.get_admin_token(server)
-        api = HTTPAPI(server['url'])
-        session = Session(api, token)
+        session = self.get_session(args)
         memb = session.fetch_member(args['rid'])
         self._format_json(memb, sys.stdout)
 
@@ -382,18 +385,12 @@ class Tool:
         api.delete(token, '/memb', headers=headers)
 
     def list_members(self, args):
-        server = self.get_chosen_server(args)
-        token = self.get_admin_token(server)
-        api = HTTPAPI(server['url'])
-        session = Session(api, token)
+        session = self.get_session(args)
         for rid in session.get_all_member_ids():
             print(rid)
 
     def dump_members(self, args):
-        server = self.get_chosen_server(args)
-        token = self.get_admin_token(server)
-        api = HTTPAPI(server['url'])
-        session = Session(api, token)
+        session = self.get_session(args)
         rids = session.get_all_member_ids()
         members = session.get_all_members()
         self._format_json(members, sys.stdout)