Moved some things around for better organization.

1 files changed, 36 insertions, 26 deletions

diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 4ad652d..8c6aa1c 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -173,6 +173,13 @@ class install (Command):
 
         self.record = None
 
+
+    # -- Option finalizing methods -------------------------------------
+    # (This is rather more involved than for most commands,
+    # because this is where the policy for installing third-
+    # party Python modules on various platforms given a wide
+    # array of user input is decided.  Yes, it's quite complex!)
+
     def finalize_options (self):
 
         # This method (and its pliant slaves, like 'finalize_unix()',
@@ -450,6 +457,8 @@ class install (Command):
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
 
+    # -- Command execution methods -------------------------------------
+
     def run (self):
 
         # Obviously have to build before we can install
@@ -486,24 +495,18 @@ class install (Command):
 
     # run ()
 
+    def create_path_file (self):
+        filename = os.path.join (self.install_libbase,
+                                 self.path_file + ".pth")
+        if self.install_path_file:
+            self.execute (write_file,
+                          (filename, [self.extra_dirs]),
+                          "creating %s" % filename)
+        else:
+            self.warn("path file '%s' not created" % filename)
 
-    # -- Predicates for sub-command list -------------------------------
-
-    def has_lib (self):
-        """Return true if the current distribution has any Python
-        modules to install."""
-        return (self.distribution.has_pure_modules() or
-                self.distribution.has_ext_modules())
-
-    def has_headers (self):
-        return self.distribution.has_headers()
-
-    def has_scripts (self):
-        return self.distribution.has_scripts()
-
-    def has_data (self):
-        return self.distribution.has_data_files()
 
+    # -- Reporting methods ---------------------------------------------
 
     def get_outputs (self):
         # This command doesn't have any outputs of its own, so just
@@ -515,7 +518,6 @@ class install (Command):
 
         return outputs
 
-
     def get_inputs (self):
         # XXX gee, this looks familiar ;-(
         inputs = []
@@ -526,15 +528,23 @@ class install (Command):
         return inputs
 
 
-    def create_path_file (self):
-        filename = os.path.join (self.install_libbase,
-                                 self.path_file + ".pth")
-        if self.install_path_file:
-            self.execute (write_file,
-                          (filename, [self.extra_dirs]),
-                          "creating %s" % filename)
-        else:
-            self.warn("path file '%s' not created" % filename)
+    # -- Predicates for sub-command list -------------------------------
+
+    def has_lib (self):
+        """Return true if the current distribution has any Python
+        modules to install."""
+        return (self.distribution.has_pure_modules() or
+                self.distribution.has_ext_modules())
+
+    def has_headers (self):
+        return self.distribution.has_headers()
+
+    def has_scripts (self):
+        return self.distribution.has_scripts()
+
+    def has_data (self):
+        return self.distribution.has_data_files()
+
 
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.