Refactor check_output out of pack_war

Change-Id: I3128564ad2bda92eb9a041c398aad9abddbd9740

tools/BUCK

@@ -13,9 +13,15 @@ python_binary(
 python_binary(
   name = 'pack_war',
   main = 'pack_war.py',
+  deps = [':util'],
   visibility = ['PUBLIC'],
 )
 
+python_library(
+  name = 'util',
+  srcs = ['util.py'],
+  visibility = ['PUBLIC'],
+)
 
 def shquote(s):
   return s.replace("'", "'\\''")

tools/pack_war.py

@@ -16,12 +16,7 @@
 from optparse import OptionParser
 from os import environ, makedirs, path, symlink
 from subprocess import check_call
-try:
+from util import check_output
-  from subprocess import check_output
-except ImportError:
-  from subprocess import Popen, PIPE
-  def check_output(*cmd):
-    return Popen(*cmd, stdout=PIPE).communicate()[0]
 
 opts = OptionParser()
 opts.add_option('-o', help='path to write WAR to')

tools/util.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+try:
+  from subprocess import check_output
+except ImportError:
+  from subprocess import Popen, PIPE
+  def check_output(*cmd):
+    return Popen(*cmd, stdout=PIPE).communicate()[0]