bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use subprocess instead of os.popen3 to avoid deprecation warnings. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1404 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-08-22 20:14:11 +00:00
parent aa8cd9bf86
commit e8334e040a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/automate/automate.py
View File

@ -48,10 +48,11 @@ def get_svn_info(path):
rev = 'None' rev = 'None'
if path[0:4] == 'http' or os.path.exists(path): if path[0:4] == 'http' or os.path.exists(path):
try: try:
(stream_in, stream_out, stream_err) = os.popen3(svn_exe+' info --xml '+path) p = subprocess.Popen([svn_exe, 'info', '--xml', path], \
err = stream_err.read() stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
if err == '': if err == '':
tree = ET.ElementTree(ET.fromstring(stream_out.read())) tree = ET.ElementTree(ET.fromstring(out))
entry = tree.getroot().find('entry') entry = tree.getroot().find('entry')
url = entry.find('url').text url = entry.find('url').text
rev = entry.attrib['revision'] rev = entry.attrib['revision']

8
tools/svn_util.py
View File

@ -4,6 +4,7 @@
import os import os
import sys import sys
import subprocess
import urllib import urllib
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
@ -28,10 +29,11 @@ def get_svn_info(path):
svn = 'svn.bat' svn = 'svn.bat'
else: else:
svn = 'svn' svn = 'svn'
(stream_in, stream_out, stream_err) = os.popen3(svn+' info --xml '+path) p = subprocess.Popen([svn, 'info', '--xml', path], \
err = stream_err.read() stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
if err == '': if err == '':
tree = ET.ElementTree(ET.fromstring(stream_out.read())) tree = ET.ElementTree(ET.fromstring(out))
entry = tree.getroot().find('entry') entry = tree.getroot().find('entry')
url = entry.find('url').text url = entry.find('url').text
rev = entry.attrib['revision'] rev = entry.attrib['revision']