From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Feb 2015 00:45:42 +0000 (-0500)
Subject: merge 3.4 (#21548)
X-Git-Tag: v3.5.0a2~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77c041ba64f87ac021c2a7a9314d9a3a1145057f;p=python

merge 3.4 (#21548)
---

77c041ba64f87ac021c2a7a9314d9a3a1145057f
diff --cc Lib/test/test_pydoc.py
index 67424442e6,1427c77fb1..41ad792144
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@@ -2,8 -2,11 +2,10 @@@ import o
  import sys
  import builtins
  import contextlib
 -import difflib
+ import importlib.util
  import inspect
  import pydoc
+ import py_compile
  import keyword
  import _pickle
  import pkgutil