Changeset 56336 in webkit

Timestamp:

Mar 22, 2010 9:24:32 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-22 Chris Jerdonek <Chris Jerdonek>

Reviewed by Adam Barth.

Refactored the cpu_count() code in executive.py.

​https://bugs.webkit.org/show_bug.cgi?id=36437

• Scripts/webkitpy/executive.py:
  • Moved the import of the multiprocessing module to the top of the file rather than importing from within a function.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/executive.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-22  Chris Jerdonek  <cjerdonek@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Refactored the cpu_count() code in executive.py.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36437
+
+        * Scripts/webkitpy/executive.py:
+          - Moved the import of the multiprocessing module to the top
+            of the file rather than importing from within a function.
+
 2010-03-22 Antonio Gomes <tonikitoo@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/executive.py

@@ -27 +27 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+try:
+    # This API exists only in Python 2.6 and higher.  :(
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
 
 import os
@@ -114 +120 @@
     @staticmethod
     def cpu_count():
-        # This API exists only in Python 2.6 and higher.  :(
-        try:
-            import multiprocessing
+        if multiprocessing:
             return multiprocessing.cpu_count()
-        except (ImportError, NotImplementedError):
-            # This quantity is a lie but probably a reasonable guess for modern
-            # machines.
-            return 2
+        # This quantity is a lie but probably a reasonable guess for modern
+        # machines.
+        return 2
 
     # Error handlers do not need to be static methods once all callers are