[Svnmerge] updates for python 2.6?

[Giovanni Bajo]

On Wed, 4 Mar 2009 10:01:32 -0500, "Dustin J. Mitchell" <dustin at zmanda.com>
wrote:
> On Tue, Mar 3, 2009 at 10:18 PM, Jon Schewe <jpschewe at mtu.net> wrote:
>> Once I updated to python 2.6 I started noticing this warning.
>>
>> /home/jpschewe/bin/svnmerge.py:71: DeprecationWarning: The popen2 module
>> is deprecated.  Use the subprocess module.
>>  import sys, os, getopt, re, types, tempfile, time, popen2, locale
> 
> Patches are appreciated!
> 
> :)

And this is an easy one: just move the popen2 import near to its only
usage. You will see that it's not being currently used, as the code already
defaults to subprocess.
-- 
Giovanni Bajo
Develer S.r.l.
http://www.develer.com