diff -r b7a966ce89ed -r 75c71c533977 mercurial/demandimport.py
--- a/mercurial/demandimport.py	Thu Oct 13 12:50:27 2016 +0200
+++ b/mercurial/demandimport.py	Fri Oct 14 03:03:39 2016 +0200
@@ -291,6 +291,8 @@
     'sqlalchemy.events', # has import-time side effects (issue5085)
     # setuptools 8 expects this module to explode early when not on windows
     'distutils.msvc9compiler',
+    '__builtin__',
+    'builtins',
     ]
 
 if _pypy: