diff -r 5402fd9dd13e -r 4f5a78fa4917 mercurial/util.py
--- a/mercurial/util.py	Thu Dec 15 14:37:36 2011 -0600
+++ b/mercurial/util.py	Thu Dec 15 14:59:22 2011 -0600
@@ -74,6 +74,11 @@
 
 # Python compatibility
 
+_notset = object()
+
+def safehasattr(thing, attr):
+    return getattr(thing, attr, _notset) is not _notset
+
 def sha1(s=''):
     '''
     Low-overhead wrapper around Python's SHA support
@@ -87,10 +92,6 @@
 
     return _fastsha1(s)
 
-_notset = object()
-def safehasattr(thing, attr):
-    return getattr(thing, attr, _notset) is not _notset
-
 def _fastsha1(s=''):
     # This function will import sha1 from hashlib or sha (whichever is
     # available) and overwrite itself with it on the first call.