--- a/hgext/convert/cvsps.py Wed Mar 02 14:23:23 2016 +0000
+++ b/hgext/convert/cvsps.py Wed Mar 02 14:56:29 2016 +0000
@@ -4,13 +4,17 @@
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
+from __future__ import absolute_import
+import cPickle as pickle
import os
import re
-import cPickle as pickle
+
+from mercurial import (
+ hook,
+ util,
+)
from mercurial.i18n import _
-from mercurial import hook
-from mercurial import util
class logentry(object):
'''Class logentry has the following attributes: