Use next() built-in

Alignment/MuonAlignment/python/geometryCSVtoXML.py

@@ -5,8 +5,8 @@
 from re import split, sub
 
 # Skip the first two lines (headers)
-stdin.next()
-stdin.next()
+next(stdin)
+next(stdin)
 
 print "<MuonAlignment>"
 print ""

CondCore/TagCollection/python/CommonUtils.py

@@ -45,7 +45,7 @@ def tagInTrees(dbsession,tagname,pfn=''):
 	invquery.addToOutputList('pfn')
 	cursor = invquery.execute()
 	tagidmap={}
-	while ( cursor.next() ):
+	while ( next(cursor) ):
 	    tagid=cursor.currentRow()['tagid'].data()
 	    pfn=cursor.currentRow()['pfn'].data()
 	    tagidmap[pfn]=tagid
@@ -76,7 +76,7 @@ def tagInTrees(dbsession,tagname,pfn=''):
 	      q.defineOutput(myresult)
 	      q.setCondition(condition,conditionBind)
 	      cr=q.execute()
-	      while (cr.next()):
+	      while (next(cr)):
 	        if cr.currentRow()['count'].data()!=0:
 		  result[pfn].append(t[len('TAGTREE_TABLE_'):])
 	      cr.close()

CondCore/TagCollection/python/DBCopy.py

@@ -32,7 +32,7 @@ def copyInventory( self ):
             source_query.defineOutput(data)
             bulkOperation=my_editor.bulkInsert(data,self.__rowcachesize)
             cursor=source_query.execute()
-            while (cursor.next() ):
+            while (next(cursor) ):
                 bulkOperation.processNextIteration()
             bulkOperation.flush()
             del bulkOperation
@@ -48,7 +48,7 @@ def copyInventory( self ):
             source_query.defineOutput(iddata)
             bulkOperation=my_ideditor.bulkInsert(iddata,self.__rowcachesize)
             cursor=source_query.execute()
-            while cursor.next():
+            while next(cursor):
                 bulkOperation.processNextIteration()
             bulkOperation.flush()
             del bulkOperation
@@ -68,7 +68,7 @@ def copyInventory( self ):
                 source_query.defineOutput(commentdata)
                 bulkOperation=my_commenteditor.bulkInsert(commentdata,self.__rowcachesize)
                 cursor=source_query.execute()
-                while cursor.next():
+                while next(cursor):
                     bulkOperation.processNextIteration()
                 bulkOperation.flush()
                 del bulkOperation
@@ -130,7 +130,7 @@ def copyTrees( self, treenames ):
 	      source_query.defineOutput(data)
 	      bulkOperation=dest_editor.bulkInsert(data,self.__rowcachesize)
 	      cursor=source_query.execute()
-              while cursor.next():
+              while next(cursor):
 	          bulkOperation.processNextIteration()
 	      bulkOperation.flush()
 	      del bulkOperation
@@ -146,7 +146,7 @@ def copyTrees( self, treenames ):
 	      source_query.defineOutput(iddata)
 	      bulkOperation=dest_editor.bulkInsert(iddata,self.__rowcachesize)
 	      cursor=source_query.execute()
-              while cursor.next():
+              while next(cursor):
 	          bulkOperation.processNextIteration()
 	      bulkOperation.flush()
 	      del bulkOperation
@@ -165,7 +165,7 @@ def copyTrees( self, treenames ):
                   source_query.defineOutput(data)
                   bulkOperation=dest_editor.bulkInsert(data,self.__rowcachesize)
                   cursor=source_query.execute()
-                  while cursor.next():
+                  while next(cursor):
                       bulkOperation.processNextIteration()
                   bulkOperation.flush()
                   del bulkOperation
@@ -248,7 +248,7 @@ def copyDB( self ):
 	    source_query.defineOutput(data)
 	    bulkOperation=my_editor.bulkInsert(data,self.__rowcachesize)
 	    cursor=source_query.execute()
-            while cursor.next():
+            while next(cursor):
 	       bulkOperation.processNextIteration()
 	    bulkOperation.flush()
 	    del bulkOperation

CondCore/TagCollection/python/DBImpl.py

@@ -17,7 +17,7 @@ def existRow( self, tableName, condition, conditionbindDict):
             query.setCondition(condition,conditionbindDict)
             cursor = query.execute()
             result=False
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 result=True
                 cursor.close()
             del query

CondCore/TagCollection/python/IdGenerator.py

@@ -18,7 +18,7 @@ def getNewID( self, IDtableName):
             query.setForUpdate() #lock it
             cursor = query.execute()
             result = 0
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 result = cursor.currentRow()[self.__idTableColumnName].data()
             del query
             return result
@@ -35,7 +35,7 @@ def incrementNextID( self, IDtableName ):
             query.setForUpdate() #lock it
             cursor = query.execute()
             result = 0
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 result = cursor.currentRow()[0].data()
             del query
             dataEditor = tableHandle.dataEditor()

CondCore/TagCollection/python/TagTree.py

@@ -211,7 +211,7 @@ def renameNodes( self, nodenamemap):
             query = schema.tableHandle(self.__tagTreeTableName).newQuery()
             query.addToOutputList('nodelabel')
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 nodelabel=cursor.currentRow()['nodelabel'].data()
                 if nodenamemap.has_key(nodelabel):
                     allnodes[nodelabel]=nodenamemap[nodelabel]
@@ -257,7 +257,7 @@ def getNodeById( self, nodeid ):
             conditionData['nodeid'].setData(nodeid)
             query.setCondition( condition, conditionData)
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 result.tagid=cursor.currentRow()['tagid'].data()
                 result.nodeid=cursor.currentRow()['nodeid'].data()
                 result.nodelabel=cursor.currentRow()['nodelabel'].data()
@@ -294,7 +294,7 @@ def getNode( self, label='ROOT' ):
             query.setCondition( condition, conditionData)
             conditionData['nodelabel'].setData(label)
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 result.tagid=cursor.currentRow()['tagid'].data()
                 result.nodeid=cursor.currentRow()['nodeid'].data()
                 result.nodelabel=cursor.currentRow()['nodelabel'].data()
@@ -339,7 +339,7 @@ def getPath( self, label ):
             query.setCondition( condition, conditionData)
             query.addToOrderList( 'lft' )
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 resultNodeLabel = cursor.currentRow()['nodelabel'].data()
                 result.append( resultNodeLabel )
             transaction.commit()
@@ -366,7 +366,7 @@ def getAllLeaves( self ):
             conditionData = coral.AttributeList()
             query.setCondition( condition, conditionData)
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 resultNode=Node.Node()
                 resultNode.tagid=cursor.currentRow()['tagid'].data()
                 resultNode.nodeid=cursor.currentRow()['nodeid'].data()
@@ -404,7 +404,7 @@ def getSubtree( self, label='ROOT' ):
                 for columnName in self.__tagTreeTableColumns:
                     query.addToOutputList(columnName)
                 cursor = query.execute()
-                while ( cursor.next() ):
+                while ( next(cursor) ):
                     resultNode=Node.Node()
                     resultNode.tagid=cursor.currentRow()['tagid'].data()
                     resultNode.nodeid=cursor.currentRow()['nodeid'].data()
@@ -437,7 +437,7 @@ def getSubtree( self, label='ROOT' ):
                 conditionData['nodelabel'].setData(label)
                 query.setCondition( condition, conditionData)
                 cursor = query.execute()
-                while ( cursor.next() ):
+                while ( next(cursor) ):
                     resultNode=Node.Node()
                     resultNode.tagid=cursor.currentRow()['p1.tagid'].data()
                     resultNode.nodeid=cursor.currentRow()['p1.nodeid'].data()
@@ -474,7 +474,7 @@ def nChildren( self, label='ROOT' ):
                 mycounts.extend('ct', 'unsigned long');
                 query.defineOutput( mycounts );
                 cursor = query.execute();
-                while ( cursor.next() ):
+                while ( next(cursor) ):
                     n= cursor.currentRow()['ct'].data()
                 transaction.commit()
                 del query

CondCore/TagCollection/python/entryComment.py

@@ -96,7 +96,7 @@ def getCommentForId( self, tableName, entryid ):
             query.addToOutputList('comment')
             query.setCondition(condition,conditionbindDict)
             cursor=query.execute()
-            if cursor.next():
+            if next(cursor):
                 comment=cursor.currentRow()['comment'].data()
                 cursor.close()
             transaction.commit()
@@ -124,7 +124,7 @@ def getCommentsForTable( self, tableName ):
             query.addToOutputList('comment')
             query.setCondition(condition,conditionbindDict)
             cursor=query.execute()
-            while cursor.next():
+            while next(cursor):
                 comment=cursor.currentRow()['comment'].data()
                 entryid=cursor.currentRow()['entryid'].data()
                 result.append((entryid,comment))  

CondCore/TagCollection/python/tagInventory.py

@@ -96,7 +96,7 @@ def addEntry( self, leafNode ):
             query.setCondition(condition,conditionbindDict)
             #duplicate=dbop.existRow(self.__tagInventoryTableName,condition,conditionbindDict)
             cursor=query.execute()
-            while( cursor.next() ):
+            while( next(cursor) ):
                 duplicate=True
                 tagid=cursor.currentRow()['tagid'].data()
                 cursor.close()
@@ -132,7 +132,7 @@ def addEntriesReplaceService( self, newservicename ):
             for columnName in self.__tagInventoryTableColumns:
                 query.addToOutputList(columnName)
             cursor=query.execute()
-            while cursor.next():
+            while next(cursor):
                 tagid=cursor.currentRow()['tagid'].data()
                 tagname=cursor.currentRow()['tagname'].data()
                 pfn=cursor.currentRow()['pfn'].data()
@@ -182,7 +182,7 @@ def modifyEntriesReplaceService( self, newservicename ):
             query = self.__session.nominalSchema().tableHandle(self.__tagInventoryTableName).newQuery()
             query.addToOutputList('pfn')
             cursor=query.execute()
-            while cursor.next():
+            while next(cursor):
                 pfn=cursor.currentRow()['pfn'].data()
                 allpfns.append(pfn)
             transaction.commit()
@@ -264,7 +264,7 @@ def getEntryByName( self, tagName, pfn ):
             query.setCondition(condition,conditionData)
             cursor = query.execute()
             counter=0
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 if counter > 0 :
                     raise ValueError, "tagName "+tagName+" is not unique, please further specify parameter pfn"
                 counter+=1
@@ -298,7 +298,7 @@ def getEntryById( self, tagId ):
             conditionData['tagid'].setData(tagId)
             query.setCondition( condition, conditionData)
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 #print 'got it'
                 leafnode.tagid=cursor.currentRow()['tagid'].data()
                 leafnode.tagname=cursor.currentRow()['tagname'].data()
@@ -324,7 +324,7 @@ def getAllEntries( self ):
             for columnName in self.__tagInventoryTableColumns:
                 query.addToOutputList(columnName)    
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 leafnode = Node.LeafNode()
                 leafnode.tagid=cursor.currentRow()['tagid'].data()
                 leafnode.tagname=cursor.currentRow()['tagname'].data()
@@ -354,7 +354,7 @@ def getIDsByName( self, name ):
             query.addToOutputList(tagid)
             query.setCondition(condition,conditionBindData)
             cursor = query.execute()
-            while ( cursor.next() ):
+            while ( next(cursor) ):
                 tagid=cursor.currentRow()['tagid'].data()
                 ids.append(tagid)
             transaction.commit()
@@ -442,7 +442,7 @@ def bulkInsertEntries( self, entries ):
             query.setForUpdate()
             cursor = query.execute()
             nextid=0
-            while cursor.next():
+            while next(cursor):
                 nextid=cursor.currentRow()[0].data()
             idEditor = self.__session.nominalSchema().tableHandle(self.__tagInventoryIDName).dataEditor()
             inputData = coral.AttributeList()

CondCore/TagCollection/test/testlonglong.py

@@ -42,7 +42,7 @@
     query.setCondition( condition, conditionData)
     conditionData['nodelabel'].setData('testtest')
     cursor = query.execute()
-    while ( cursor.next() ):
+    while ( next(cursor) ):
         tagid=cursor.currentRow()['tagid'].data()
         print 'tagid',tagid
         nodeid=cursor.currentRow()['nodeid'].data()

CondCore/Utilities/python/generateWrappers.py

@@ -18,7 +18,7 @@ def guessPackage() :
     lines = ( line for line in file('src/plugin.cc')
               if (line.find('CondFormats')>0 and line.find('DataRecord')<0)
     )
-    _f = lines.next()
+    _f = next(lines)
     _f = _f[_f.find('CondFormats/')+len('CondFormats/'):]
     return _f[:_f.find('/')]
 

DQM/Integration/scripts/filecollector/commonAnTS.py

@@ -57,11 +57,11 @@ def prettyPrintUnits(value,unit,decimals=0):
     it=iter(units)
     v=long(value/1024)
     p=0
-    runit=it.next()
+    runit=next(it)
     while v > 0:
       v=long(v/1024)
       try:
-        runit=it.next()
+        runit=next(it)
         p+=1
       except:
         break

Documentation/ReferenceManualScripts/python/BeautifulSoup.py

@@ -370,7 +370,7 @@ def _findAll(self, name, attrs, text, limit, generator, **kwargs):
         g = generator()
         while True:
             try:
-                i = g.next()
+                i = next(g)
             except StopIteration:
                 break
             if i:

FWCore/GuiBrowsers/python/Vispa/Gui/FindDialog.py

@@ -274,7 +274,7 @@ def findNext(self):
             self._findPreviousButton.show()
             self._findNextButton.setText("&Next")
         else:
-            object=self._findAlgorithm.next()
+            object=next(self._findAlgorithm)
         self._updateNumberLabel()
         self.emit(SIGNAL("found"),object)
 

FWCore/GuiBrowsers/python/Vispa/Plugins/EventBrowser/EventBrowserPlugin.py

@@ -64,7 +64,7 @@ def next(self):
         """ Calls next() function of current tab controller.
         """
         try:
-            self.application().currentTabController().next()
+            next(self.application().currentTabController())
         except NoCurrentTabControllerException:
             logging.warning(self.__class__.__name__ + ": next() - No tab controller found.")
 

FWCore/GuiBrowsers/test/Plugins/EdmBrowser/testEdmDataAccessor.py

@@ -61,7 +61,7 @@ def testExample(self):
 #        self.assertEqual(countDaughterRelations(accessor),3)
 #        self.assertEqual(int(float(accessor.propertyValue(accessor.children(accessor.children(accessor.topLevelObjects()[0])[0])[2],"Mass"))),92)
 
-        accessor.next()
+        next(accessor)
         self.assertEqual(accessor.eventNumber(),2)
 #        self.assertEqual(int(float(accessor.propertyValue(accessor.children(accessor.children(accessor.topLevelObjects()[0])[0])[2],"Mass"))),96)
 

FWCore/Services/bin/EdgesToViz.py

@@ -30,7 +30,7 @@ def readtable(flook):
     for line in flook.xreadlines():
         s = line.split()
         if not s[7] in cols:
-            cols[s[7]] = next.next()
+            cols[s[7]] = next(next)
         s.append(cols[s[7]])
         tab[s[0]]=s
     return tab,cols

RecoBTag/CTagging/test/test_discriminator_presence.py

@@ -8,7 +8,7 @@
 jet_labels = ["selectedPatJets"]#, "selectedPatJetsAK4PF", "selectedPatJetsAK8PFCHSSoftDropSubjets"]
 tested_discriminators = ['pfCombinedCvsLJetTags', 'pfCombinedCvsBJetTags']
 
-evt = events.__iter__().next()
+evt = next(events.__iter__())
 handle = Handle('std::vector<pat::Jet>')
 for label in jet_labels:
    evt.getByLabel(label, handle)