Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/sitewide/usersettings.py b/sitewide/usersettings.py
index bb65ddd..8484afc 100644
--- a/sitewide/usersettings.py
+++ b/sitewide/usersettings.py
@@ -9,7 +9,7 @@
 from __future__ import absolute_import
 
 import time
-import urllib
+from six.moves import urllib
 
 import ezt
 
@@ -63,3 +63,13 @@
         saved=1, ts=int(time.time()))
 
     return url
+
+  # pylint: disable=unused-argument
+  def GetUserSetting(self, **kwargs):
+    return
+    # return self.handler(**kwargs)
+
+  # pylint: disable=unused-argument
+  def PostUserSetting(self, **kwargs):
+    return
+    # return self.handler(**kwargs)