--- a/mercurial/context.py	Sat Mar 11 20:53:20 2017 -0500
+++ b/mercurial/context.py	Sat Mar 11 20:57:04 2017 -0500
@@ -33,6 +33,7 @@
     obsolete as obsmod,
     patch,
     phases,
+    pycompat,
     repoview,
     revlog,
     scmutil,
@@ -419,7 +420,7 @@
                 self._node = repo.changelog.node(changeid)
                 self._rev = changeid
                 return
-            if isinstance(changeid, long):
+            if not pycompat.ispy3 and isinstance(changeid, long):
                 changeid = str(changeid)
             if changeid == 'null':
                 self._node = nullid