[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[terry.reedy]

https://hg.python.org/cpython/rev/697dfcadfc99
changeset:   101239:697dfcadfc99
parent:      101237:66a1fbdbe4bb
parent:      101238:3279c910d0e0
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri May 06 15:58:13 2016 -0400
summary:
  Merge with 3.5

files:
  Lib/lib2to3/tests/pytree_idempotency.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/lib2to3/tests/pytree_idempotency.py b/Lib/lib2to3/tests/pytree_idempotency.py
--- a/Lib/lib2to3/tests/pytree_idempotency.py
+++ b/Lib/lib2to3/tests/pytree_idempotency.py
@@ -18,8 +18,8 @@
 
 # Local imports
 from .. import pytree
-import pgen2
-from pgen2 import driver
+from .. import pgen2
+from ..pgen2 import driver
 
 logging.basicConfig()
 

-- 
Repository URL: https://hg.python.org/cpython