diff -r 143d21a7343e -r 075146e85bb6 contrib/check-code.py
--- a/contrib/check-code.py	Fri Jul 15 23:00:31 2016 +0530
+++ b/contrib/check-code.py	Wed Jul 13 23:38:29 2016 +0530
@@ -333,6 +333,7 @@
     (r'^import cPickle', "don't use cPickle, use util.pickle"),
     (r'^import pickle', "don't use pickle, use util.pickle"),
     (r'^import httplib', "don't use httplib, use util.httplib"),
+    (r'^import BaseHTTPServer', "use util.httpserver instead"),
     (r'\.next\(\)', "don't use .next(), use next(...)"),
 
     # rules depending on implementation of repquote()