diff -r 032c4c2f802a -r 75309badb485 contrib/check-code.py
--- a/contrib/check-code.py	Wed Apr 06 23:22:12 2016 +0000
+++ b/contrib/check-code.py	Thu Apr 07 00:34:07 2016 +0000
@@ -316,6 +316,8 @@
     (r'def.*[( ]\w+=\{\}', "don't use mutable default arguments"),
     (r'\butil\.Abort\b', "directly use error.Abort"),
     (r'^import Queue', "don't use Queue, use util.queue + util.empty"),
+    (r'^import cStringIO', "don't use cStringIO.StringIO, use util.stringio"),
+    (r'^import urllib', "don't use urllib, use util.urlreq/util.urlerr"),
   ],
   # warnings
   [