Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaed2b6d

Browse files
committed
Call warn with warning instances
1 parent7a6fe76 commitaed2b6d

File tree

3 files changed

+53
-49
lines changed

3 files changed

+53
-49
lines changed

‎compoundfiles/entities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ def isdir(self):
188188
def_check(self,valid,message):
189189
ifnotvalid:
190190
warnings.warn(
191-
'%s in dir entry %d'% (message,self._index),
192-
CompoundFileWarning)
191+
CompoundFileWarning(
192+
'%s in dir entry %d'% (message,self._index)))
193193

194194
def_build_tree(self,entries):
195195

‎compoundfiles/reader.py

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,15 @@ def __init__(self, filename_or_obj):
228228
self._mini_sector_size=1<<mini_sector_size
229229
ifnot (128<=self._normal_sector_size<=1048576):
230230
warnings.warn(
231+
CompoundFileSectorSizeWarning(
231232
'FAT sector size is silly (%d bytes), '
232-
'assuming 512'%self._normal_sector_size,
233-
CompoundFileSectorSizeWarning)
233+
'assuming 512'%self._normal_sector_size))
234234
self._normal_sector_size=512
235235
ifnot (8<=self._mini_sector_size<self._normal_sector_size):
236236
warnings.warn(
237+
CompoundFileSectorSizeWarning(
237238
'mini FAT sector size is silly (%d bytes), '
238-
'assuming 64'%self._mini_sector_size,
239-
CompoundFileSectorSizeWarning)
239+
'assuming 64'%self._mini_sector_size))
240240
self._mini_sector_size=64
241241
self._normal_sector_format=st.Struct(
242242
native_str('<%dL'% (self._normal_sector_size//4)))
@@ -249,40 +249,40 @@ def __init__(self, filename_or_obj):
249249
ifself._dll_version==3:
250250
ifself._normal_sector_size!=512:
251251
warnings.warn(
252+
CompoundFileSectorSizeWarning(
252253
'unexpected sector size in v3 file '
253-
'(%d)'%self._normal_sector_size,
254-
CompoundFileSectorSizeWarning)
254+
'(%d)'%self._normal_sector_size))
255255
ifself._dir_sector_count!=0:
256256
warnings.warn(
257+
CompoundFileHeaderWarning(
257258
'directory chain sector count is non-zero '
258-
'(%d)'%self._dir_sector_count,
259-
CompoundFileHeaderWarning)
259+
'(%d)'%self._dir_sector_count))
260260
elifself._dll_version==4:
261261
ifself._normal_sector_size!=4096:
262262
warnings.warn(
263+
CompoundFileSectorSizeWarning(
263264
'unexpected sector size in v4 file '
264-
'(%d)'%self._normal_sector_size,
265-
CompoundFileSectorSizeWarning)
265+
'(%d)'%self._normal_sector_size))
266266
else:
267267
raiseCompoundFileVersionError(
268268
'unsupported DLL version (%d)'%self._dll_version)
269269
ifself._mini_sector_size!=64:
270270
warnings.warn(
271+
CompoundFileSectorSizeWarning(
271272
'unexpected mini sector size '
272-
'(%d)'%self._mini_sector_size,
273-
CompoundFileSectorSizeWarning)
273+
'(%d)'%self._mini_sector_size))
274274
ifuuid!= (b'\0'*16):
275275
warnings.warn(
276-
'CLSID of compound file is non-zero (%r)'%uuid,
277-
CompoundFileHeaderWarning)
276+
CompoundFileHeaderWarning(
277+
'CLSID of compound file is non-zero (%r)'%uuid))
278278
iftxn_signature!=0:
279279
warnings.warn(
280-
'transaction signature is non-zero '
281-
'(%d)'%txn_signature,CompoundFileHeaderWarning)
280+
CompoundFileHeaderWarning(
281+
'transaction signature is non-zero(%d)'%txn_signature))
282282
ifunused!= (b'\0'*6):
283283
warnings.warn(
284-
'unused header bytes are non-zero '
285-
'(%r)'%unused,CompoundFileHeaderWarning)
284+
CompoundFileHeaderWarning(
285+
'unused header bytes are non-zero(%r)'%unused))
286286
self._file_size=self._mmap.size()
287287
self._header_size=max(self._normal_sector_size,512)
288288
self._max_sector= (self._file_size-self._header_size)//self._normal_sector_size
@@ -348,8 +348,7 @@ def _load_master_fat(self):
348348
# Note: when reading the master-FAT we deliberately disregard the
349349
# master-FAT sector count read from the header as implementations may
350350
# set this incorrectly. Instead, we scan for END_OF_CHAIN (or
351-
# FREE_SECTOR) in the DIFAT after each read and stop when we find it.
352-
# In order to avoid infinite loops (in the case of a stupid or
351+
# FREE_SECTOR) in the DIFAT after each read and stop when we find it. # In order to avoid infinite loops (in the case of a stupid or
353352
# malicious file) we keep track of each sector we seek to and quit in
354353
# the event of a repeat
355354
self._master_fat=array(native_str('L'))
@@ -366,17 +365,18 @@ def _load_master_fat(self):
366365
sector=self._master_first_sector
367366
ifcount==0andsector==FREE_SECTOR:
368367
warnings.warn(
368+
CompoundFileMasterFatWarning(
369369
'DIFAT extension pointer is FREE_SECTOR, assuming no '
370-
'extension',CompoundFileMasterFatWarning)
370+
'extension'))
371371
sector=END_OF_CHAIN
372372
elifcount==0andsector!=END_OF_CHAIN:
373373
warnings.warn(
374-
'DIFAT extension pointer with zero count',
375-
CompoundFileMasterFatWarning)
374+
CompoundFileMasterFatWarning(
375+
'DIFAT extension pointer with zero count'))
376376
elifcount!=0andsector==END_OF_CHAIN:
377377
warnings.warn(
378-
'DIFAT chained from header, or incorrect '
379-
'count',CompoundFileMasterFatWarning)
378+
CompoundFileMasterFatWarning(
379+
'DIFAT chained from header, or incorrect count'))
380380
sector=self._master_fat.pop()
381381

382382
whileTrue:
@@ -387,20 +387,20 @@ def _load_master_fat(self):
387387
break
388388
elifvalue==FREE_SECTOR:
389389
warnings.warn(
390-
'DIFAT terminated by FREE_SECTOR',
391-
CompoundFileMasterFatWarning)
390+
CompoundFileMasterFatWarning(
391+
'DIFAT terminated by FREE_SECTOR'))
392392
value=END_OF_CHAIN
393393
break
394394
elifself._max_sector<value<=MAX_NORMAL_SECTOR:
395395
warnings.warn(
396-
'sector in DIFAT chain beyond file end '
397-
'(%d)'%value,CompoundFileMasterFatWarning)
396+
CompoundFileMasterFatWarning(
397+
'sector in DIFAT chain beyond file end(%d)'%value))
398398
value=END_OF_CHAIN
399399
break
400400
elifvalue>MAX_NORMAL_SECTOR:
401401
warnings.warn(
402-
'invalid special value in DIFAT chain '
403-
'(%d)'%value,CompoundFileMasterFatWarning)
402+
CompoundFileMasterFatWarning(
403+
'invalid special value in DIFAT chain(%d)'%value))
404404
ifvalue==END_OF_CHAIN:
405405
delself._master_fat[index:]
406406
break
@@ -428,18 +428,18 @@ def _load_master_fat(self):
428428

429429
ifcount>0:
430430
warnings.warn(
431-
'DIFAT end encountered early (expected %d more '
432-
'sectors)'%count,CompoundFileMasterFatWarning)
431+
CompoundFileMasterFatWarning(
432+
'DIFAT end encountered early (expected %d moresectors)'%count))
433433
elifcount<0:
434434
warnings.warn(
435-
'DIFAT end encountered late (overran by %d '
436-
'sectors)'%-count,CompoundFileMasterFatWarning)
435+
CompoundFileMasterFatWarning(
436+
'DIFAT end encountered late (overran by %dsectors)'%-count))
437437
self._master_sector_count-=count
438438
iflen(self._master_fat)!=self._normal_sector_count:
439439
warnings.warn(
440+
CompoundFileMasterFatWarning(
440441
'DIFAT length does not match FAT sector count '
441-
'(%d != %d)'% (len(self._master_fat),self._normal_sector_count),
442-
CompoundFileMasterFatWarning)
442+
'(%d != %d)'% (len(self._master_fat),self._normal_sector_count)))
443443
self._normal_sector_count=len(self._master_fat)
444444
returnsectors
445445

@@ -465,22 +465,26 @@ def _load_normal_fat(self, master_sectors):
465465
formaster_sectorinmaster_sectors:
466466
ifself._normal_fat[master_sector]!=MASTER_FAT_SECTOR:
467467
warnings.warn(
468+
CompoundFileMasterSectorWarning(
468469
'DIFAT sector %d marked incorrectly in FAT '
469470
'(%d != %d)'% (
470471
master_sector,
471472
self._normal_fat[master_sector],
472473
MASTER_FAT_SECTOR,
473-
),CompoundFileMasterSectorWarning)
474+
)
475+
))
474476
self._normal_fat[master_sector]=MASTER_FAT_SECTOR
475477
fornormal_sectorinself._master_fat:
476478
ifself._normal_fat[normal_sector]!=NORMAL_FAT_SECTOR:
477479
warnings.warn(
480+
CompoundFileNormalSectorWarning(
478481
'FAT sector %d marked incorrectly in FAT '
479482
'(%d != %d)'% (
480483
normal_sector,
481484
self._normal_fat[normal_sector],
482485
NORMAL_FAT_SECTOR,
483-
),CompoundFileNormalSectorWarning)
486+
)
487+
))
484488
self._normal_fat[normal_sector]=NORMAL_FAT_SECTOR
485489

486490
def_load_mini_fat(self):
@@ -498,14 +502,14 @@ def _load_mini_fat(self):
498502
# is shorter)
499503
ifself._mini_first_sector==FREE_SECTOR:
500504
warnings.warn(
501-
'mini FAT first sector set to FREE_SECTOR',
502-
CompoundFileMiniFatWarning)
505+
CompoundFileMiniFatWarning(
506+
'mini FAT first sector set to FREE_SECTOR'))
503507
self._mini_first_sector=END_OF_CHAIN
504508
elifself._max_sector<self._mini_first_sector<=MAX_NORMAL_SECTOR:
505509
warnings.warn(
510+
CompoundFileMiniFatWarning(
506511
'mini FAT first sector beyond file end '
507-
'(%d)'%self._mini_first_sector,
508-
CompoundFileMiniFatWarning)
512+
'(%d)'%self._mini_first_sector))
509513
self._mini_first_sector=END_OF_CHAIN
510514
ifself._mini_first_sector!=END_OF_CHAIN:
511515
withCompoundFileNormalStream(

‎compoundfiles/streams.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ def __init__(self, parent, start, length=None):
180180
self._length=max_length
181181
elifnot (min_length<=length<=max_length):
182182
warnings.warn(
183+
CompoundFileWarning(
183184
'length (%d) of stream at sector %d exceeds bounds '
184-
'(%d-%d)'% (length,start,min_length,max_length),
185-
CompoundFileWarning)
185+
'(%d-%d)'% (length,start,min_length,max_length)))
186186
self._length=max_length
187187
else:
188188
self._length=length
@@ -223,9 +223,9 @@ def __init__(self, parent, start, length=None):
223223
max_length=len(self._sectors)*self._sector_size
224224
iflengthisnotNoneandlength>max_length:
225225
warnings.warn(
226+
CompoundFileWarning(
226227
'length (%d) of stream at sector %d exceeds max'% (
227-
length,start,max_length),
228-
CompoundFileWarning)
228+
length,start,max_length)))
229229
self._length=min(max_length,lengthormax_length)
230230
self._set_pos(0)
231231

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp