diff -r 897726622877 -r 6a70cf94d1b5 contrib/check-code.py
--- a/contrib/check-code.py	Sun Jan 15 16:33:15 2017 +0900
+++ b/contrib/check-code.py	Sun Jan 15 13:17:05 2017 +0530
@@ -465,9 +465,10 @@
     (r'os\.sep', "use pycompat.ossep instead (py3)"),
     (r'os\.pathsep', "use pycompat.ospathsep instead (py3)"),
     (r'os\.altsep', "use pycompat.osaltsep instead (py3)"),
-    (r'os\.getenv', "use pycompat.osgetenv instead (py3)"),
     (r'sys\.platform', "use pycompat.sysplatform instead (py3)"),
     (r'getopt\.getopt', "use pycompat.getoptb instead (py3)"),
+    (r'os\.getenv', "use encoding.environ.get instead"),
+    (r'os\.setenv', "modifying the environ dict is not preferred"),
   ],
   # warnings
   [],