--- a/contrib/debugcmdserver.py	Sun Mar 06 03:01:46 2016 +0530
+++ b/contrib/debugcmdserver.py	Sun Mar 06 03:06:09 2016 +0530
@@ -7,10 +7,12 @@
 # $ ./hg serve --cmds pipe | ./contrib/debugcmdserver.py -
 # o, 52   -> 'capabilities: getencoding runcommand\nencoding: UTF-8'
 
-import sys, struct
+from __future__ import absolute_import, print_function
+import struct
+import sys
 
 if len(sys.argv) != 2:
-    print 'usage: debugcmdserver.py FILE'
+    print('usage: debugcmdserver.py FILE')
     sys.exit(1)
 
 outputfmt = '>cI'

--- a/tests/test-check-py3-compat.t	Sun Mar 06 03:01:46 2016 +0530
+++ b/tests/test-check-py3-compat.t	Sun Mar 06 03:06:09 2016 +0530
@@ -5,8 +5,6 @@
   $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py
   contrib/check-code.py not using absolute_import
   contrib/check-code.py requires print_function
-  contrib/debugcmdserver.py not using absolute_import
-  contrib/debugcmdserver.py requires print_function
   contrib/debugshell.py not using absolute_import
   contrib/fixpax.py not using absolute_import
   contrib/fixpax.py requires print_function