Merge lp:~fginther/codetree/fix-charm-symlinks into lp:codetree

[Francis Ginther]

Use a subproccess call to unzip instead of the zipfile module to avoid corrupting symlinks.

Use a subproccess call to unzip instead of the zipfile module to avoid corrupting symlinks.

Testing:
Created a config file consisting of:

postgresql cs:trusty/postgresql

and verified that when executed, the symlinks under the postgresql/hooks directory exist. Prior to this change they are extracted as regular files containing the symlink target as the content of the file.

[lp:~fginther/codetree/fix-charm-symlinks]

65. By Francis Ginther on 2016-06-02

Fix test_download_invalid_zip to match use of unzip.

[Tim Kuhlman (timkuhlman)]

Thanks! I am adding "stderr=subprocess.STDOUT" so the test output remains clean.

[Tim Kuhlman (timkuhlman)]

review: Approve

=== modified file 'codetree/handlers/charm.py'
--- codetree/handlers/charm.py	2016-06-01 16:12:47 +0000
+++ codetree/handlers/charm.py	2016-06-02 11:23:14 +0000
@@ -2,11 +2,11 @@
 import logging
 import os
 import shutil
+import subprocess
 import sys
 import tempfile
 from urlparse import urlparse
 import urllib2
-import zipfile
 
 from basic import SourceHandler
 from exceptions import InvalidOption
@@ -65,8 +65,7 @@
         tmp_dir = tempfile.mkdtemp()
         try:
             zipped_path = self.cs_download(tmp_dir)
-            with zipfile.ZipFile(zipped_path, 'r') as zipped:
-                zipped.extractall(dest)
+            subprocess.check_output(['unzip', zipped_path, '-d', dest])
         except Exception:
             raise
         finally:

=== modified file 'debian/control'
--- debian/control	2016-02-09 17:42:19 +0000
+++ debian/control	2016-06-02 11:23:14 +0000
@@ -7,5 +7,5 @@
 
 Package: python-codetree
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-bzrlib, python-concurrent.futures, git, rsync
+Depends: ${misc:Depends}, ${python:Depends}, python-bzrlib, python-concurrent.futures, git, rsync, unzip
 Description: A code tree builder

=== modified file 'tests/test_charm_handler.py'
--- tests/test_charm_handler.py	2016-05-12 15:52:25 +0000
+++ tests/test_charm_handler.py	2016-06-02 11:23:14 +0000
@@ -2,11 +2,11 @@
 import os
 from pkg_resources import resource_filename
 import shutil
+import subprocess
 import tempfile
 from unittest import TestCase
 from urlparse import urlparse
 import urllib2
-import zipfile
 
 from codetree.handlers import CharmStoreHandler
 from codetree.handlers.utils import handler_types
@@ -112,5 +112,5 @@
         test_sha = '0291dbcaaa51039c59ae631f106d95791fb8c74815fee44f3f31fea7f9f30d001e24d038e90ed632d1d71a6f4082ad5c'
         _urlopen.return_value = MockedReq(file_data='not a valid zip', sha=test_sha)
 
-        with self.assertRaises(zipfile.BadZipfile):
+        with self.assertRaises(subprocess.CalledProcessError):
             self.cs.get(dest, {})