# HG changeset patch # User timeless@gmail.com # Date 1461178732 0 # Node ID 1247d87a738da61407bd81f10cba7192d8439577 # Parent 48c3a472aec7381426fcca402dd755147ad3e82d py3: tolerate io/StringIO divergence diff -r 48c3a472aec7 -r 1247d87a738d hgext/evolve.py --- a/hgext/evolve.py Sun Apr 24 22:31:58 2016 -0400 +++ b/hgext/evolve.py Wed Apr 20 18:58:52 2016 +0000 @@ -61,7 +61,12 @@ import sys, os import random -from StringIO import StringIO +try: + import StringIO as io + StringIO = io.StringIO +except ImportError: + import io + StringIO = io.StringIO import re import collections import socket