Blame 0003-Avoid-calling-zipfile.open-.-rU.patch
|
 |
ae76542 |
From f0196bad669f0a46a33f7fa2f5afb85d00204cf3 Mon Sep 17 00:00:00 2001
|
|
|
ae76542 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
ae76542 |
Date: Tue, 20 Dec 2016 10:15:38 +0100
|
|
|
ae76542 |
Subject: [PATCH 3/3] Avoid calling zipfile.open(..., "rU")
|
|
|
ae76542 |
|
|
|
ae76542 |
Fixes: #33
|
|
|
ae76542 |
---
|
|
|
ae76542 |
python/javapackages/common/manifest.py | 4 ++--
|
|
|
ae76542 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
ae76542 |
|
|
|
ae76542 |
diff --git a/python/javapackages/common/manifest.py b/python/javapackages/common/manifest.py
|
|
|
ae76542 |
index 5830d80..9a27ff8 100644
|
|
|
ae76542 |
--- a/python/javapackages/common/manifest.py
|
|
|
ae76542 |
+++ b/python/javapackages/common/manifest.py
|
|
|
ae76542 |
@@ -60,7 +60,7 @@ class Manifest(object):
|
|
|
ae76542 |
try:
|
|
|
ae76542 |
jarfile = ZipFile(self._path)
|
|
|
ae76542 |
if "META-INF/MANIFEST.MF" in jarfile.namelist():
|
|
|
ae76542 |
- mf = jarfile.open("META-INF/MANIFEST.MF", "rU")
|
|
|
ae76542 |
+ mf = jarfile.open("META-INF/MANIFEST.MF", "r")
|
|
|
ae76542 |
except IOError:
|
|
|
ae76542 |
pass
|
|
|
ae76542 |
if mf is None:
|
|
|
ae76542 |
@@ -93,7 +93,7 @@ class Manifest(object):
|
|
|
ae76542 |
|
|
|
ae76542 |
def _normalize_manifest(self):
|
|
|
ae76542 |
lines = []
|
|
|
ae76542 |
- manifest = self._manifest.split(u'\n')
|
|
|
ae76542 |
+ manifest = self._manifest.splitlines()
|
|
|
ae76542 |
for line in manifest:
|
|
|
ae76542 |
if line.startswith(' '):
|
|
|
ae76542 |
lines[-1] += line.strip()
|
|
|
ae76542 |
--
|
|
|
ae76542 |
2.9.3
|
|
|
ae76542 |
|