diff options
| author | jvoisin | 2012-12-16 15:21:26 +0100 |
|---|---|---|
| committer | jvoisin | 2012-12-16 15:21:26 +0100 |
| commit | d649c2ae14521159d0f6173c73ac5b903f30cd36 (patch) | |
| tree | 60970c08f59741cd6f563444b814b4ae3ad4bcc6 /MAT | |
| parent | ffcb08763dcdaeef0caabc3fcb4d1442fce404ef (diff) | |
archive.py is now python's implementation independent
Diffstat (limited to 'MAT')
| -rw-r--r-- | MAT/archive.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/MAT/archive.py b/MAT/archive.py index a749b29..f78a2a7 100644 --- a/MAT/archive.py +++ b/MAT/archive.py | |||
| @@ -51,13 +51,13 @@ class ZipStripper(GenericArchiveStripper): | |||
| 51 | Check if a ZipInfo object is clean of metadatas added | 51 | Check if a ZipInfo object is clean of metadatas added |
| 52 | by zip itself, independently of the corresponding file metadatas | 52 | by zip itself, independently of the corresponding file metadatas |
| 53 | ''' | 53 | ''' |
| 54 | if fileinfo.comment is not '': | 54 | if fileinfo.comment != '': |
| 55 | return False | 55 | return False |
| 56 | elif fileinfo.date_time is not 0: | 56 | elif fileinfo.date_time != 0: |
| 57 | return False | 57 | return False |
| 58 | elif fileinfo.create_system is not 0: | 58 | elif fileinfo.create_system != 0: |
| 59 | return False | 59 | return False |
| 60 | elif fileinfo.create_version is not 0: | 60 | elif fileinfo.create_version != 0: |
| 61 | return False | 61 | return False |
| 62 | else: | 62 | else: |
| 63 | return True | 63 | return True |
| @@ -169,7 +169,7 @@ class TarStripper(GenericArchiveStripper): | |||
| 169 | for item in tarin.getmembers(): | 169 | for item in tarin.getmembers(): |
| 170 | tarin.extract(item, self.tempdir) | 170 | tarin.extract(item, self.tempdir) |
| 171 | name = os.path.join(self.tempdir, item.name) | 171 | name = os.path.join(self.tempdir, item.name) |
| 172 | if item.type is '0': # is item a regular file ? | 172 | if item.type == '0': # is item a regular file ? |
| 173 | #no backup file | 173 | #no backup file |
| 174 | try: | 174 | try: |
| 175 | cfile = mat.create_class_file(name, False, | 175 | cfile = mat.create_class_file(name, False, |
| @@ -191,15 +191,15 @@ class TarStripper(GenericArchiveStripper): | |||
| 191 | ''' | 191 | ''' |
| 192 | Check metadatas added by tar | 192 | Check metadatas added by tar |
| 193 | ''' | 193 | ''' |
| 194 | if current_file.mtime is not 0: | 194 | if current_file.mtime != 0: |
| 195 | return False | 195 | return False |
| 196 | elif current_file.uid is not 0: | 196 | elif current_file.uid != 0: |
| 197 | return False | 197 | return False |
| 198 | elif current_file.gid is not 0: | 198 | elif current_file.gid != 0: |
| 199 | return False | 199 | return False |
| 200 | elif current_file.uname is not '': | 200 | elif current_file.uname != '': |
| 201 | return False | 201 | return False |
| 202 | elif current_file.gname is not '': | 202 | elif current_file.gname != '': |
| 203 | return False | 203 | return False |
| 204 | else: | 204 | else: |
| 205 | return True | 205 | return True |
| @@ -215,7 +215,7 @@ class TarStripper(GenericArchiveStripper): | |||
| 215 | return False | 215 | return False |
| 216 | tarin.extract(item, self.tempdir) | 216 | tarin.extract(item, self.tempdir) |
| 217 | name = os.path.join(self.tempdir, item.name) | 217 | name = os.path.join(self.tempdir, item.name) |
| 218 | if item.type is '0': # is item a regular file ? | 218 | if item.type == '0': # is item a regular file ? |
| 219 | try: | 219 | try: |
| 220 | class_file = mat.create_class_file(name, | 220 | class_file = mat.create_class_file(name, |
| 221 | False, self.add2archive) # no backup file | 221 | False, self.add2archive) # no backup file |
| @@ -239,7 +239,7 @@ class TarStripper(GenericArchiveStripper): | |||
| 239 | tarin = tarfile.open(self.filename, 'r' + self.compression) | 239 | tarin = tarfile.open(self.filename, 'r' + self.compression) |
| 240 | metadata = {} | 240 | metadata = {} |
| 241 | for current_file in tarin.getmembers(): | 241 | for current_file in tarin.getmembers(): |
| 242 | if current_file.type is '0': | 242 | if current_file.type == '0': |
| 243 | if not self.is_file_clean(current_file): # if there is meta | 243 | if not self.is_file_clean(current_file): # if there is meta |
| 244 | current_meta = {} | 244 | current_meta = {} |
| 245 | current_meta['mtime'] = current_file.mtime | 245 | current_meta['mtime'] = current_file.mtime |
