# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1289981875 -3600
# Node ID ac627ab0b3a5ea4ed6778cd6fbe23c6105894a32
# Parent  cffa35529706a199a82557f424f552fbf8517065# Parent  e98bf69480923c3014c9ed33f4abbf43d41a6936
merge with stable

diff -r cffa35529706 -r ac627ab0b3a5 mercurial/httprepo.py
--- a/mercurial/httprepo.py	Wed Nov 17 09:06:38 2010 +0100
+++ b/mercurial/httprepo.py	Wed Nov 17 09:17:55 2010 +0100
@@ -68,7 +68,7 @@
         raise util.Abort(_('operation not supported over http'))
 
     def _callstream(self, cmd, **args):
-        if cmd is 'pushkey':
+        if cmd == 'pushkey':
             args['data'] = ''
         data = args.pop('data', None)
         headers = args.pop('headers', {})
diff -r cffa35529706 -r ac627ab0b3a5 mercurial/posix.py
--- a/mercurial/posix.py	Wed Nov 17 09:06:38 2010 +0100
+++ b/mercurial/posix.py	Wed Nov 17 09:17:55 2010 +0100
@@ -144,7 +144,7 @@
         try:
             fd = os.open(path, O_SYMLINK)
         except OSError, err:
-            if err.errno is errno.ENOENT:
+            if err.errno == errno.ENOENT:
                 return path
             raise