← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/zip.py

  • Committer: Matt Giuca
  • Date: 2009-02-24 05:59:10 UTC
  • mto: This revision was merged to the branch mainline in revision 1119.
  • Revision ID: matt.giuca@gmail.com-20090224055910-gevty3r7urdsq4zw
File browser: Re-styled the path area, now has a yellow 3D-looking gradient
    thing.
    Added image-source/filepathbar-bg.svg, and corresponding png.
    Changed filesystem/browser/media/browser.css to the new style.
    (Note: This breaks the two bars below it; that's OK, we're about to
    restyle them too).
Removed redundant span from filesystem/browser/template.html.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/zip.py
27
27
import zipfile
28
28
 
29
29
from ivle import studpath
30
 
from ivle.fileservice_lib.exceptions import WillNotOverwrite
31
30
 
32
31
def make_zip(basepath, paths, file):
33
32
    """Zips up a bunch of files on the student file space and writes it as
95
94
    The path is an absolute path in the current filesystem
96
95
    (if this code is executed inside the jail, then it's inside the jail).
97
96
    """
 
97
    # XXX: Really bad, but circular imports need avoiding.
 
98
    from ivle.fileservice_lib.exceptions import WillNotOverwrite
 
99
 
98
100
    zip = zipfile.ZipFile(file, 'r')
99
101
    # First test the zip file
100
102
    if zip.testzip() is not None: