Merge branch 'master' into use-packaging

Conflicts:
	.hgtags
	CHANGES.txt
	ez_setup.py
	setuptools.egg-info/requires.txt
	setuptools/version.py

2 files changed, 3 insertions, 3 deletions

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 68548272..2e00b996 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -35,7 +35,7 @@ import warnings
 import site
 import struct
 
-from setuptools import Command, _dont_write_bytecode
+from setuptools import Command
 from setuptools.sandbox import run_setup
 from setuptools.py31compat import get_path, get_config_vars
 from setuptools.command import setopt
@@ -1152,7 +1152,7 @@ See the setuptools documentation for the "develop" command for more info.
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
-        if _dont_write_bytecode:
+        if sys.dont_write_bytecode:
             self.warn('byte-compiling is disabled, skipping.')
             return
 
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 992709f1..fd0f118b 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -27,7 +27,7 @@ class install_egg_info(Command):
         ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
-        self.outputs = []
+        self.outputs = [self.target]
 
     def run(self):
         self.run_command('egg_info')