From: Noel Power <noel.power@suse.com>
Date: Fri, 4 May 2018 10:22:43 +0000 (+0100)
Subject: python/samba: Bulk replace of '.next()' method with function 'next()'
X-Git-Tag: ldb-1.4.0~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63648af515df6c62e44ebeaa81d73e49511d03bc;p=thirdparty%2Fsamba.git

python/samba: Bulk replace of '.next()' method with function 'next()'

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/idmap.py b/python/samba/idmap.py
index 0cb729fbc29..a618347fa21 100644
--- a/python/samba/idmap.py
+++ b/python/samba/idmap.py
@@ -95,4 +95,4 @@ type: %s
 cn: %s
 
 """ % (sid, unixid, sid, type_string, sid)
-        self.add(self.parse_ldif(mod).next()[1])
+        self.add(next(self.parse_ldif(mod))[1])
diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 1e2e040e934..f849e6ee837 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -1879,7 +1879,7 @@ samba-tool user syncpasswords --terminate \\
                 self.current_pid = None
                 self.outf.write("Initialized cache_ldb[%s]\n" % (cache_ldb))
                 msgs = self.cache.parse_ldif(add_ldif)
-                changetype,msg = msgs.next()
+                changetype,msg = next(msgs)
                 ldif = self.cache.write_ldif(msg, ldb.CHANGETYPE_NONE)
                 self.outf.write("%s" % ldif)
             else:
diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 7ff98df6b3e..473dbaf2ce4 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -26,7 +26,7 @@ from samba import irpc, messaging
 def show_sessions(conn):
     """show open sessions"""
 
-    sessions = conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS).next()
+    sessions = next(conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS))
     print "User                                  Client      Connected at"
     print "-" * 79
     for session in sessions:
@@ -37,7 +37,7 @@ def show_sessions(conn):
 def show_tcons(open_connection):
     """show open tree connects"""
     conn = open_connection("smb_server")
-    tcons = conn.smbsrv_information(irpc.SMBSRV_INFO_TCONS).next()
+    tcons = next(conn.smbsrv_information(irpc.SMBSRV_INFO_TCONS))
     print "Share                                 Client      Connected at"
     print "-" * 79
     for tcon in tcons:
@@ -47,7 +47,7 @@ def show_tcons(open_connection):
 def show_nbt(open_connection):
     """show nbtd information"""
     conn = open_connection("nbt_server")
-    stats = conn.nbtd_information(irpc.NBTD_INFO_STATISTICS).next()
+    stats = next(conn.nbtd_information(irpc.NBTD_INFO_STATISTICS))
     print "NBT server statistics:"
     fields = [("total_received", "Total received"),
               ("total_sent", "Total sent"),