Added proper json infomation of user.

manage_users.py

@@ -25,18 +25,19 @@ if __name__ == '__main__':
                               'http://mailman-core:8001/3.1')
     CORE_USER = os.environ.get('MAILMAN_REST_USER', 'restadmin')
     CORE_PASS = os.environ.get('MAILMAN_REST_PASSWORD', 'restpass')
+    # Default Email list
+    LIST_NAME = 'apachesvn@lists.med.stanford.edu'
+
 
     # user invoked variables
     parser.add_argument('--list_fqdn', default=LIST_NAME)
     parser.add_argument('-r','--restore')
-
-    # Add arguments for env variables
+ # Add arguments for env variables
     parser.add_argument('--core-uri', dest='core_uri', default=CORE_URI)
     parser.add_argument('--rest-user', dest='core_user', default=CORE_USER)
     parser.add_argument('--rest-password', dest='core_password', default=CORE_PASS)
 
-    # Default Email list
-    LIST_NAME = 'apachesvn@lists.med.stanford.edu'
+
     # Parse out the command line arguments
     args = parser.parse_args()
 
@@ -76,19 +77,14 @@ if __name__ == '__main__':
                 #print json.dumps(member.rest_data, indent=2)
                 #print json.dumps(member.user.rest_data, indent=2)
                 print json.dumps(members_hash, indent=2)
-<<<<<<< HEAD
                 #print "E###########################"
                 #print("debug"+str(member))
 
         # Get all the members
-        elif ml_fqdn.upper() == 'ALL':
+     elif ml_fqdn.upper() == 'ALL':
             members_hash={}
-=======
-        # Get all the member
-        elif email_list.upper() == 'ALL':
             print "I couldn't get this to finsih!!!."
             members_hash = {}
->>>>>>> 59e0f7996d525f3ca98dbfcf6c92b5f34d4bbb3a
             # grabs users per page
             page = client.get_user_page(count=100, page=1)
 
@@ -96,21 +92,14 @@ if __name__ == '__main__':
             while len(page) > 0:
                 for member in page:
                     print json.dumps(member.addresses.rest_data, indent=2)
-<<<<<<< HEAD
                     time.sleep(.100) #pause between pages
                 page = page.next
 
-=======
-                    time.sleep(.100)  # pause between pages
-
-                page = page.next
-
             # # Get json data from each member
             # for member in client.members:
             #     members_hash['email']= member.email
             #     print json.dumps(members_hash, indent=2)
 
->>>>>>> 59e0f7996d525f3ca98dbfcf6c92b5f34d4bbb3a
         else:
             sys.exit('Error: Email list"'+ml_fqdn+'" does not exist in domain '+args.core_uri +
                      "\nSee List\n"+get_ml_fqdns(ml_fqdns))