Commits

Patrick Mézard  committed 2ee7281

wireproto: fix check-code.py breakage introduced by 6d97dd630d79

  • Participants
  • Parent commits cd73bbc

Comments (0)

Files changed (2)

File mercurial/wireproto.py

                 # partially encode name over the wire for backwards compat
                 yield '%s\0%d\n' % (store.encodedir(name), size)
                 if size <= 65536:
-                    yield sopener(name).read(size)
+                    fp = sopener(name)
+                    try:
+                        data = fp.read(size)
+                    finally:
+                        fp.close()
+                    yield data
                 else:
                     for chunk in util.filechunkiter(sopener(name), limit=size):
                         yield chunk

File tests/test-check-code-hg.t

   >     exit 80
   > fi
   $ hg manifest | xargs "$check_code" || echo 'FAILURE IS NOT AN OPTION!!!'
-  mercurial/wireproto.py:562:
-   >                     yield sopener(name).read(size)
-   use opener.read() instead
-  FAILURE IS NOT AN OPTION!!!
 
   $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 || true
   hgext/convert/cvsps.py:0:
   mercurial/commands.py:0:
    >     ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
    warning: unwrapped ui message
-  mercurial/wireproto.py:0:
-   >                     yield sopener(name).read(size)
-   use opener.read() instead
   tests/autodiff.py:0:
    >         ui.write('data lost for: %s\n' % fn)
    warning: unwrapped ui message