bundle2: move the 'close' method off the unpackermixin

bundle2: move the 'close' method off the unpackermixin

This method is unrelated to unpacking and only used by the unbundle20 class.
We move it there for clarity.

--- a/mercurial/bundle2.py	Sun Apr 09 18:12:54 2017 +0200
+++ b/mercurial/bundle2.py	Sun Apr 09 19:08:24 2017 +0200
@@ -660,11 +660,6 @@
                     raise
         return None
 
-    def close(self):
-        """close underlying file"""
-        if util.safehasattr(self._fp, 'close'):
-            return self._fp.close()
-
 def getunbundler(ui, fp, magicstring=None):
     """return a valid unbundler object for a given magicstring"""
     if magicstring is None:
@@ -817,6 +812,11 @@
         self.params # load params
         return self._compressed
 
+    def close(self):
+        """close underlying file"""
+        if util.safehasattr(self._fp, 'close'):
+            return self._fp.close()
+
 formatmap = {'20': unbundle20}
 
 b2streamparamsmap = {}