8000 Merge branch 'master' into docs · libvips/pyvips@09003dc · GitHub
[go: up one dir, main page]
Skip to content

Commit 09003dc

Browse files
jcupittjcupitt
committed
Merge branch 'master' into docs
2 parents 9fd8e54 + 26a7952 commit 09003dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+931
-803
lines changed

‎README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@ Run test suite::
7777
$ nosetests --logging-level=WARNING
7878
$ python3 -m "nose" --logging-level=WARNING
7979

80+
Stylecheck::
81+
82+
$ flake8

‎examples/cod.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import sys
44

5-
import logging
6-
# logging.basicConfig(level = logging.DEBUG)
7-
85
import pyvips
96

7+
# import logging
8+
# logging.basicConfig(level = logging.DEBUG)
109
# pyvips.cache_set_trace(True)
1110

1211

‎examples/read_profile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import sys
44

5-
# import logging
6-
# logging.basicConfig(level = logging.DEBUG)
7-
85
import pyvips
96

7+
# import logging
8+
# logging.basicConfig(level = logging.DEBUG)
109
# pyvips.cache_set_trace(True)
1110

1211
a = pyvips.Image.new_from_file(sys.argv[1])

‎examples/try1.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
import pyvips
44

5-
print 'test Image'
5+
print('test Image')
66
image = pyvips.Image.new_from_file('/home/john/pics/k2.jpg')
7-
print 'image =', image
8-
print 'image.width =', image.width
9-
print ''
7+
print('image =', image)
8+
print('image.width =', image.width)
9+
print('\n''')
1010

11-
print 'test Operation'
11+
print('test Operation')
1212
image2 = pyvips.Operation.call('embed', image, 1, 2, 3, 4, extend='copy')
13-
print 'image2 =', image2
14-
print ''
15-
16-
print 'test getattr'
13+
print('image2 =', image2)
14+
print('\n''')
15+
print('test getattr')
1716
image2 = image.embed(1, 2, 3, 4, extend='copy')
18-
print 'image2 =', image2
19-
print ''
17+
print('image2 =', image2)
18+
print('\n''')

‎examples/try10.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/usr/bin/python
22

3-
import sys
4-
5-
import logging
3+
# import logging
64
# logging.basicConfig(level = logging.DEBUG)
75

86
import pyvips

‎examples/try11.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import sys
44

5+
import pyvips
6+
57
# import logging
68
# logging.basicConfig(level = logging.DEBUG)
79

8-
import pyvips
9-
1010
a = pyvips.Image.new_from_file(sys.argv[1])
1111

1212
ipct = a.get("ipct-data")
1313

14-
print "ipct = ", ipct.get()
14+
print("ipct = ", ipct.get())
1515

1616
a.remove("ipct-data")
1717

‎examples/try13.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/python
22

3-
import sys
3+
# import pyvips
44
import logging
5-
import pyvips
65

76
logging.basicConfig(level=logging.DEBUG)

‎examples/try14.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#!/usr/bin/python
22

3-
import sys
4-
5-
import logging
3+
# import logging
64
# logging.basicConfig(level = logging.DEBUG)
75

86
import pyvips

‎examples/try16.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#!/usr/bin/python3
22

3-
import sys
43
import logging
4+
import sys
5+
56
import pyvips
67

78
logging.basicConfig(level=logging.DEBUG)
9+
810
# pyvips.cache_set_trace(True)
911

1012
a = pyvips.Image.new_from_file(sys.argv[1])

‎examples/try17.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#!/usr/bin/python3
22

33
import sys
4-
import logging
4+
55
import pyvips
66

7-
# pyvips.cache_set_trace(True)
7+
# import logging
88
# logging.basicConfig(level = logging.DEBUG)
99

10+
# pyvips.cache_set_trace(True)
11+
1012
a = pyvips.Image.new_from_file(sys.argv[1])
1113

1214
a = a[1:]

‎examples/try2.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
#!/usr/bin/python
22

33
import logging
4+
45
import pyvips
56

67
logging.basicConfig(level=logging.DEBUG)
78
pyvips.cache_set_trace(True)
89

910
try:
1011
a = pyvips.Image.new_from_file("/home/john/pics/babe.poop")
11-
except pyvips.Error, e:
12-
print e
12+
except pyvips.Error as e:
13+
print(str(e))
1314

1415
a = pyvips.Image.new_from_file("/home/john/pics/babe.jpg")
1516
b = pyvips.Image.new_from_file("/home/john/pics/k2.jpg")
1617

17-
print 'a =', a
18-
print 'b =', b
18+
print('a =', a)
19+
print('b =', b)
1920

2021
out = pyvips.call("add", a, b)
2122

22-
print 'out =', out
23+
print('out =', out)
2324

2425
out = a.add(b)
2526

26-
print 'out =', out
27+
print('out =', out)
2728

2829
out = out.linear([1, 1, 1], [2, 2, 2])
2930

‎examples/try3.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#!/usr/bin/python
22

33
import sys
4+
45
import pyvips
5-
# import logging
66

7+
# import logging
78
# logging.basicConfig(level = logging.DEBUG)
9+
810
pyvips.cache_set_trace(True)
911

1012
a = pyvips.Image.new_from_file(sys.argv[1])
11-
print a.max()
12-
print a.max()
13+
print(a.max())
14+
print(a.max())

‎examples/try4.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/python
22

33
import sys
4+
45
import pyvips
5-
# import logging
66

7+
# import logging
78
# logging.basicConfig(level = logging.DEBUG)
89

910
a = pyvips.Image.new_from_file(sys.argv[1])

‎examples/try5.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
#!/usr/bin/python
22

33
import sys
4-
# import logging
4+
55
import pyvips
66

7+
# import logging
78
# logging.basicConfig(level = logging.DEBUG)
89

10+
a = pyvips.Image.new_from_file(sys.argv[1])
11+
912

1013
def should_equal(test, a, b):
1114
if abs(a - b) > 0.01:
12-
print '%s: seen %g and %g' % (test, a, b)
15+
print('%s: seen %g and %g' % (test, a, b))
1316
sys.exit(1)
1417

1518

1619
def bandsplit(a):
1720
return [a.extract_band(i) for i in range(0, a.bands)]
1821

1922

20-
a = pyvips.Image.new_from_file(sys.argv[1])
21-
2223
# test operator overloads
2324

2425
# addition
2526
b = a + 12
2627
should_equal('add constant', a.avg() + 12, b.avg())
2728

2829
b = a + [12, 0, 0]
29-
x = map(lambda x: x.avg()) bandsplit(a)
30-
y = map(lambda x: x.avg()) bandsplit(b)
30+
x = map(lambda x: x.avg())
31+
bandsplit(a)
32+
y = map(lambda x: x.avg())
33+
bandsplit(b)
3134
x[0] += 12
3235
should_equal('add multiband constant', sum(x), sum(y))
3336

34-
3537
b = a + [12, 0, 0]
3638
b = a + b
3739
b = 12 + a

‎examples/try6.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/python
22

33
import sys
4-
# import logging
4+
55
import pyvips
66

7+
# import logging
78
# logging.basicConfig(level = logging.DEBUG)
89

910
a = pyvips.Image.new_from_file(sys.argv[1])

‎examples/try7.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/python
22

33
import sys
4-
# import logging
4+
55
import pyvips
66

7+
# import logging
78
# logging.basicConfig(level = logging.DEBUG)
89

910
a = pyvips.Image.new_from_file(sys.argv[1])

‎examples/try8.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#!/usr/bin/python
22

3-
import sys
43
# import logging
5-
import pyvips
6-
74
# logging.basicConfig(level = logging.DEBUG)
85

6+
import pyvips
7+
98
a = pyvips.Image.new_from_array([[1, 2, 3], [4, 5, 6], [7, 8, 9]], 8, 128)
109

11-
print 'scale =', a.get('scale')
12-
print 'offset =', a.get('offset')
10+
print('scale =', a.get('scale'))
11+
print('offset =', a.get('offset'))
1312

1413
a.write_to_file("x.v")

‎examples/try9.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/python
22

3-
import sys
43
import logging
4+
55
import pyvips
66

77
logging.basicConfig(level=logging.DEBUG)

0 commit comments

Comments
 (0)
0