[Python-modules-commits] [fparser] 04/09: py3 complete?

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch dev-python3
in repository fparser.

commit 8d14960697389921e3d068ea8a83e9fd7ffad679
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 25 16:59:49 2017 +0100

    py3 complete?
---
 src/fparser/readfortran.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/fparser/readfortran.py b/src/fparser/readfortran.py
index 825fa3e..d1c6601 100644
--- a/src/fparser/readfortran.py
+++ b/src/fparser/readfortran.py
@@ -80,20 +80,20 @@ Examples
     >> from fparser.readfortran import FortranFileReader
     >>> import os
     >>> reader = FortranFileReader(os.path.expanduser('~/src/blas/daxpy.f'))
-    >>> print reader.next()
+    >>> print next(reader)
     line #1 'subroutine daxpy(n,da,dx,incx,dy,incy)'
-    >>> print repr(reader.next())
+    >>> print repr(next(reader))
     Comment('c     constant times a vector plus a vector.\\nc     uses unrolled loops for increments equal to one.\\nc     jack dongarra, linpack, 3/11/78.\\nc     modified 12/3/93, array(1) declarations changed to array(*)',(3, 6))
-    >>> print repr(reader.next())
+    >>> print repr(next(reader))
     Line('double precision dx(*),dy(*),da',(8, 8),'')
-    >>> print repr(reader.next())
+    >>> print repr(next(reader))
     Line('integer i,incx,incy,ix,iy,m,mp1,n',(9, 9),'')
 
 Note that the ``.next()`` method may return `Line`, `SyntaxErrorLine`,
 `Comment`, `MultiLine`, or `SyntaxErrorMultiLine` instance.
 Let us continue with the above example session to illustrate the `Line` methods and attributes::
 
-    >>> item = reader.next()
+    >>> item = next(reader)
     >>> item
         Line('if (da .eq. 0.0d0) return',(12, 12),'')
     >>> item.line
@@ -118,11 +118,11 @@ To read a Fortran code from a string, use `FortranStringReader` class::
     ... '''
     >>> reader = FortranStringReader(code)
     >>> reader.set_mode(False, True)
-    >>> reader.next()
+    >>> next(reader)
         Line('subroutine foo(a)',(2, 2),'')
-    >>> reader.next()
+    >>> next(reader)
         Line('integer a',(3, 3),'')
-    >>> reader.next()
+    >>> next(reader)
         Line('print*,\"a=\",a',(4, 4),'')
 
 """
@@ -321,7 +321,7 @@ class Line(object):
 
     def parse_block(self, reader, cls, parent_cls):
         key = cls, tuple(parent_cls)
-        if not self.parse_cache.has_key(key):
+        if key not in  self.parse_cache:
             #self.parse_cache[key] = None
             obj = cls(reader, parent_cls = parent_cls)
             self.parse_cache[key] = obj
@@ -447,7 +447,7 @@ class FortranReaderBase(object):
         return '%s(%r, %r, %r)' % (self.__class__.__name__, self.source, self.isfree, self.isstrict)
 
     def find_module_source_file(self, mod_name):
-        from utils import get_module_file, module_in_file
+        from .utils import get_module_file, module_in_file
         if self.source_only:
             for sf in self.source_only:
                 if module_in_file(mod_name, sf):
@@ -514,7 +514,7 @@ class FortranReaderBase(object):
         elif mode=='pyf':
             isfree, isstrict=True, True
         else:
-            raise NotImplementedError(`mode`)
+            raise NotImplementedError(repr(mode))
         self.set_mode(isfree, isstrict)
     
     def close_source(self):
@@ -571,7 +571,7 @@ class FortranReaderBase(object):
         if self.isclosed:
             return None
         try:
-            line = self.source.next()
+            line = next(self.source)
         except StopIteration:
             self.isclosed = True
             self.close_source()
@@ -646,7 +646,7 @@ class FortranReaderBase(object):
             if self.reader is not None:
                 # inside INCLUDE statement
                 try:
-                    return self.reader.next()
+                    return next(self.reader)
                 except StopIteration:
                     self.reader = None
             item = self._next(ignore_comments)
@@ -1182,7 +1182,7 @@ class FortranReaderBase(object):
                     # first line, check for a label
                     m = _label_re.match(line)
                     if m:
-                        assert not label,`label`
+                        assert not label,repr(label)
                         label = int(m.group('label'))
                         line = line[m.end():]
                     # check for a construct name
@@ -1235,7 +1235,7 @@ class FortranReaderBase(object):
         if name is not None:
             self.error('No construct following construct-name.')
         if have_comment:
-            return self.next()
+            return next(self)
         return self.comment_item('', startlineno, endlineno)
 
     ##  FortranReaderBase
@@ -1288,7 +1288,7 @@ cf2py call me ! hey
       end
      '"""
     reader = FortranStringReader(string_f77)
-    assert reader.mode=='fix77', `reader.mode`
+    assert reader.mode=='fix77', repr(reader.mode)
     for item in reader:
         print (item)
 
@@ -1330,7 +1330,7 @@ end python module foo
 ! end of file
 """
     reader = FortranStringReader(string_pyf)
-    assert reader.mode=='pyf', `reader.mode`
+    assert reader.mode=='pyf', repr(reader.mode)
     for item in reader:
         print (item)
 
@@ -1355,7 +1355,7 @@ cComment
       end
 """
     reader = FortranStringReader(string_fix90)
-    assert reader.mode=='fix90', `reader.mode`
+    assert reader.mode=='fix90', repr(reader.mode)
     for item in reader:
         print (item)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/fparser.git