Commit1f320f5

committed

Fix mmap to match behaviour on py3

Eurgh ... ints from bytes

1 parentaeed9ac commit1f320f5Copy full SHA for 1f320f5

File tree

2 files changed

+42

-9

lines changed

compoundfiles
- mmap.py
tests
- test_mmap.py

2 files changed

+42

-9

lines changed

`‎compoundfiles/mmap.py`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@`
`34`	`34`	`exceptNameError:`
`35`	`35`	`pass`
`36`	`36`
	`37`	`+`
	`38`	`+importsys`
	`39`	`+PY2=sys.version_info[0]==2`
`37`	`40`	`importio`
`38`	`41`	`importthreading`
`39`	`42`
`@@ -80,7 +83,10 @@ def __getitem__(self, key):`
`80`	`83`	`key+=self._size`
`81`	`84`	`ifnot (0<=key<self._size):`
`82`	`85`	`raiseIndexError('fake mmap index out of range')`
`83`		`-key=slice(key,key+1,1)`
	`86`	`+self._file.seek(key)`
	`87`	`+ifPY2:`
	`88`	`+returnself._file.read(1)`
	`89`	`+returnord(self._file.read(1))`
`84`	`90`	`step=1ifkey.stepisNoneelsekey.step`
`85`	`91`	`ifstep>0:`
`86`	`92`	`start=min(self._size,max(0, (`
`@@ -111,7 +117,7 @@ def __getitem__(self, key):`
`111`	`117`	`self._file.seek(start)`
`112`	`118`	`ifstart>=stop:`
`113`	`119`	`returnb''`
`114`		`-returnb''.join(reversed(self._file.read(stop-start)))[::-step]`
	`120`	`+returnself._file.read(stop-start)[::-1][::-step]`
`115`	`121`	`else:`
`116`	`122`	`raiseValueError('slice step cannot be zero')`
`117`	`123`	`finally:`
`@@ -163,7 +169,9 @@ def read(self, num):`
`163`	`169`	`defread_byte(self):`
`164`	`170`	`# XXX Beyond EOF = ValueError`
`165`	`171`	`withself._lock:`
`166`		`-returnself._file.read(1)`
	`172`	`+ifPY2:`
	`173`	`+returnself._file.read(1)`
	`174`	`+returnord(self._file.read(1))`
`167`	`175`
`168`	`176`	`defreadline(self):`
`169`	`177`	`withself._lock:`

`‎tests/test_mmap.py`

Lines changed: 31 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`str=type('')`
`32`	`32`
`33`	`33`
	`34`	`+importsys`
`34`	`35`	`importio`
`35`	`36`	`importmmap`
`36`	`37`	`importcompoundfiles.mmapasfake_mmap`
`@@ -69,11 +70,23 @@ def test_read_only(test_map):`
`69`	`70`	`deftest_len(test_map):`
`70`	`71`	`assertlen(test_map)==26`
`71`	`72`
`72`		`-deftest_indexing(test_map):`
	`73`	`+@pytest.mark.skipif(sys.version_info[0]==3,`
	`74`	`+reason="py2 mmap is an array of chars")`
	`75`	`+deftest_indexing_v2(test_map):`
`73`	`76`	`asserttest_map[0]==b'a'`
`74`	`77`	`asserttest_map[4]==b'e'`
`75`	`78`	`asserttest_map[-1]==b'z'`
`76`	`79`	`asserttest_map[-3]==b'x'`
	`80`	`+`
	`81`	`+@pytest.mark.skipif(sys.version_info[0]==2,`
	`82`	`+reason="py3 mmap is an array of ints")`
	`83`	`+deftest_indexing_v3(test_map):`
	`84`	`+asserttest_map[0]==ord(b'a')`
	`85`	`+asserttest_map[4]==ord(b'e')`
	`86`	`+asserttest_map[-1]==ord(b'z')`
	`87`	`+asserttest_map[-3]==ord(b'x')`
	`88`	`+`
	`89`	`+deftest_indexing(test_map):`
`77`	`90`	`withpytest.raises(IndexError):`
`78`	`91`	`test_map[30]`
`79`	`92`	`withpytest.raises(IndexError):`
`@@ -94,7 +107,7 @@ def test_slicing(test_map):`
`94`	`107`	`asserttest_map[-5:-1:2]==b'vx'`
`95`	`108`
`96`	`109`	`deftest_negative_slicing(test_map):`
`97`		`-asserttest_map[::-1]==b''.join(reversed(test_map[:]))`
	`110`	`+asserttest_map[::-1]==b'zyxwvutsrqponmlkjihgfedcba'`
`98`	`111`	`asserttest_map[::-2]==b'zxvtrpnljhfdb'`
`99`	`112`	`asserttest_map[-2::-2]==b'ywusqomkigeca'`
`100`	`113`	`asserttest_map[5:10:-1]==b''`
`@@ -127,6 +140,22 @@ def test_rfind(test_map):`
`127`	`140`	`asserttest_map.rfind(b'xyz',0,-1)==-1`
`128`	`141`	`asserttest_map.rfind(b'foobar')==-1`
`129`	`142`
	`143`	`+@pytest.mark.skipif(sys.version_info[0]==3,`
	`144`	`+reason="py2 read_byte returns bytes")`
	`145`	`+deftest_seek_n_read_v2(test_map):`
	`146`	`+test_map.seek(-3,io.SEEK_END)`
	`147`	`+asserttest_map.read_byte()==b'x'`
	`148`	`+asserttest_map.read_byte()==b'y'`
	`149`	`+asserttest_map.read_byte()==b'z'`
	`150`	`+`
	`151`	`+@pytest.mark.skipif(sys.version_info[0]==2,`
	`152`	`+reason="py3 read_byte returns an int")`
	`153`	`+deftest_seek_n_read_v3(test_map):`
	`154`	`+test_map.seek(-3,io.SEEK_END)`
	`155`	`+asserttest_map.read_byte()==ord(b'x')`
	`156`	`+asserttest_map.read_byte()==ord(b'y')`
	`157`	`+asserttest_map.read_byte()==ord(b'z')`
	`158`	`+`
`130`	`159`	`deftest_seek_n_read(test_map):`
`131`	`160`	`test_map.seek(0)`
`132`	`161`	`asserttest_map.read(26)==b'abcdefghijklmnopqrstuvwxyz'`
`@@ -136,10 +165,6 @@ def test_seek_n_read(test_map):`
`136`	`165`	`test_map.seek(-3,io.SEEK_END)`
`137`	`166`	`asserttest_map.read(-1)==b'xyz'`
`138`	`167`	`asserttest_map.read(-1)==b''`
`139`		`-test_map.seek(-3,io.SEEK_CUR)`
`140`		`-asserttest_map.read_byte()==b'x'`
`141`		`-asserttest_map.read_byte()==b'y'`
`142`		`-asserttest_map.read_byte()==b'z'`
`143`	`168`	`test_map.seek(0,io.SEEK_SET)`
`144`	`169`	`asserttest_map.readline()==b'abcdefghijklmnopqrstuvwxyz'`
`145`	`170`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1f320f5

File tree

2 files changed

2 files changed

`‎compoundfiles/mmap.py`

`‎tests/test_mmap.py`

0 commit comments