Renamed all 'options' class attributes to 'user_options'.

Lib/distutils/command/build.py

@@ -14,7 +14,8 @@ class build (Command):
 
     description = "build everything needed to install"
 
-    options = [('build-base=', 'b',
+    user_options = [
+        ('build-base=', 'b',
          "base directory for build library"),
         ('build-lib=', 'l',
          "directory for platform-shared files"),

Lib/distutils/command/build_clib.py

@@ -28,7 +28,8 @@ from distutils.ccompiler import new_compiler
 
 class build_lib (Command):
 
-    options = [('debug', 'g',
+    user_options = [
+        ('debug', 'g',
          "compile with debugging information"),
         ]
 

Lib/distutils/command/build_ext.py

@@ -42,7 +42,8 @@ class build_ext (Command):
     #     takes care of both command-line and client options
     #     in between set_default_options() and set_final_options())
 
-    options = [('build-dir=', 'd',
+    user_options = [
+        ('build-dir=', 'd',
          "directory for compiled extension modules"),
         ('include-dirs=', 'I',
          "list of directories to search for header files"),

Lib/distutils/command/build_lib.py

@@ -28,7 +28,8 @@ from distutils.ccompiler import new_compiler
 
 class build_lib (Command):
 
-    options = [('debug', 'g',
+    user_options = [
+        ('debug', 'g',
          "compile with debugging information"),
         ]
 

Lib/distutils/command/build_py.py

@@ -18,7 +18,8 @@ class build_py (Command):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 
-    options = [('build-dir=', 'd', "directory for platform-shared files"),
+    user_options = [
+        ('build-dir=', 'd', "directory for platform-shared files"),
         ]
 
 

Lib/distutils/command/install.py

@@ -16,7 +16,8 @@ class install (Command):
 
     description = "install everything from build directory"
 
-    options = [('prefix=', None, "installation prefix"),
+    user_options = [
+        ('prefix=', None, "installation prefix"),
         ('exec-prefix=', None,
          "prefix for platform-specific files"),
 

Lib/distutils/command/install_ext.py

@@ -13,7 +13,8 @@ class install_ext (Command):
 
     description = "install C/C++ extension modules"
     
-    options = [('install-dir=', 'd', "directory to install to"),
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
         ('build-dir=','b', "build directory (where to install from)"),
         ]
 

Lib/distutils/command/install_lib.py

@@ -10,7 +10,8 @@ class install_py (Command):
 
     description = "install pure Python modules"
 
-    options = [('install-dir=', 'd', "directory to install to"),
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
         ('build-dir=','b', "build directory (where to install from)"),
         ('compile', 'c', "compile .py to .pyc"),
         ('optimize', 'o', "compile .py to .pyo (optimized)"),

Lib/distutils/command/install_py.py

@@ -10,7 +10,8 @@ class install_py (Command):
 
     description = "install pure Python modules"
 
-    options = [('install-dir=', 'd', "directory to install to"),
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
         ('build-dir=','b', "build directory (where to install from)"),
         ('compile', 'c', "compile .py to .pyc"),
         ('optimize', 'o', "compile .py to .pyo (optimized)"),

Lib/distutils/command/sdist.py

@@ -21,7 +21,8 @@ class sdist (Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 
-    options = [('template=', 't',
+    user_options = [
+        ('template=', 't',
          "name of manifest template file [default: MANIFEST.in]"),
         ('manifest=', 'm',
          "name of manifest file [default: MANIFEST]"),