From: Georg Brandl <georg@python.org>
Date: Fri, 26 Feb 2016 18:37:52 +0000 (+0100)
Subject: merge with 3.5
X-Git-Tag: v3.6.0a1~559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3902d62c4e9810f1386090dd60b38f5aa6e99512;p=python

merge with 3.5
---

3902d62c4e9810f1386090dd60b38f5aa6e99512
diff --cc Doc/library/zipfile.rst
index 54b8cc5a2d,9b0d18a365..19b354daee
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@@ -591,10 -573,4 +589,5 @@@ Instances have the following attributes
  
     Size of the uncompressed file.
  
- There is one method:
 +
- .. method:: ZipInfo.is_dir()
- 
-    Return ``True`` if the ZipInfo represents a directory.
- 
-    .. versionadded:: 3.6
+ .. _PKZIP Application Note: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT