[pypy-commit] pypy py3.5-noninherit: hg merge py3.5

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5-noninherit
Changeset: r86581:1ffd7af6c0b2
Date: 2016-08-26 19:17 +0200
http://bitbucket.org/pypy/pypy/changeset/1ffd7af6c0b2/

Log:	hg merge py3.5

diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py
--- a/pypy/module/posix/__init__.py
+++ b/pypy/module/posix/__init__.py
@@ -19,7 +19,7 @@
         'statvfs_result': 'app_posix.statvfs_result',
         'uname_result': 'app_posix.uname_result',
         'urandom': 'app_posix.urandom',
-        'terminal_size': 'app_posix.terminal_size'
+        'terminal_size': 'app_posix.terminal_size',
     }
     if os.name == 'nt':
         del appleveldefs['urandom'] # at interp on win32
@@ -75,7 +75,7 @@
         'abort': 'interp_posix.abort',
         'urandom': 'interp_posix.urandom',
         'device_encoding': 'interp_posix.device_encoding',
-        'get_terminal_size': 'interp_posix.get_terminal_size'
+        'get_terminal_size': 'interp_posix.get_terminal_size',
 
         'scandir': 'interp_scandir.scandir',
         'get_inheritable': 'interp_posix.get_inheritable',