Commits

Jasper Schulz committed e246372 Merge

merged upstream

  • Participants
  • Parent commits 10f5281, 6b8457a

Comments (0)

Files changed (3)

File pypy/doc/whatsnew-head.rst

 .. branch: reflex-support
 Provides cppyy module (disabled by default) for access to C++ through Reflex.
 See doc/cppyy.rst for full details and functionality.
-
+.. branch: nupypy-axis-arg-check
+Check that axis arg is valid in _numpypy
 
 .. "uninteresting" branches that we should just ignore for the whatsnew:
 .. branch: slightly-shorter-c

File pypy/rlib/parsing/parsing.py

         error = None # for the annotator
         if self.parser.is_nonterminal(symbol):
             rule = self.parser.get_rule(symbol)
-            lastexpansion = len(rule.expansions) - 1
             subsymbol = None
             error = None
             for expansion in rule.expansions:
                 curr = i
                 children = []
-                for j in range(len(expansion)):
-                    subsymbol = expansion[j]
+                for subsymbol in expansion:
                     node, next, error2 = self.match_symbol(curr, subsymbol)
                     if node is None:
                         error = combine_errors(error, error2)

File pypy/rpython/module/ll_os.py

     _WIN32 = True
 else:
     _WIN32 = False
+
 if _WIN32:
     underscore_on_windows = '_'
 else:
     underscore_on_windows = ''
 
-_DARWIN = sys.platform.startswith('darwin')
-
 includes = []
 if not _WIN32:
     # XXX many of these includes are not portable at all
     includes += ['dirent.h', 'sys/stat.h',
                  'sys/times.h', 'utime.h', 'sys/types.h', 'unistd.h',
                  'signal.h', 'sys/wait.h', 'fcntl.h']
-    if _DARWIN:
-        includes += ['util.h']
-    else:
-        includes += ['pty.h']
-
 else:
     includes += ['sys/utime.h']