Add some clarifying comments. Remove ez_setup.py.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>

python/google/protobuf/internal/_parameterized.py

@@ -263,6 +263,8 @@ def _ModifyClass(class_object, testcases, naming_type):
       'Cannot add parameters to %s,'
       ' which already has parameterized methods.' % (class_object,))
   class_object._id_suffix = id_suffix = {}
+  # We change the size of __dict__ while we iterate over it, 
+  # which Python 3.x will complain about, so use copy().
   for name, obj in class_object.__dict__.copy().items():
     if (name.startswith(unittest.TestLoader.testMethodPrefix)
         and isinstance(obj, types.FunctionType)):

python/setup.py

@@ -8,19 +8,7 @@ import sys
 
 # We must use setuptools, not distutils, because we need to use the
 # namespace_packages option for the "google" package.
-try:
-  from setuptools import setup, Extension, find_packages
-except ImportError:
-  try:
-    from ez_setup import use_setuptools
-    use_setuptools()
-    from setuptools import setup, Extension, find_packages
-  except ImportError:
-    sys.stderr.write(
-        "Could not import setuptools; make sure you have setuptools or "
-        "ez_setup installed.\n"
-    )
-    raise
+from setuptools import setup, Extension, find_packages
 
 from distutils.command.clean import clean as _clean
 

python/tox.ini

 [tox]
 envlist =
+    # Py3 tests currently fail because of text handling issues,
+    # So only test py26/py27 for now.
     #py26,py27,py33,py34
     py26,py27