Skip to content

Commit 5bfa6b6

Browse files
tekktriktekktrik
authored
Merge pull request #49 from prcutler/issue32
Fix Issue32 - remove flush argument
2 parents 4fcaaa3 + 460deeb commit 5bfa6b6

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎examples/fingerprint_r503.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def get_fingerprint():
3939
def get_fingerprint_detail():
4040
"""Get a finger print image, template it, and see if it matches!
4141
This time, print out each error instead of just returning on failure"""
42-
print("Getting image...", end="", flush=True)
42+
print("Getting image...", end="")
4343
i = finger.get_image()
4444
if i == adafruit_fingerprint.OK:
4545
print("Image taken")
@@ -52,7 +52,7 @@ def get_fingerprint_detail():
5252
print("Other error")
5353
return False
5454

55-
print("Templating...", end="", flush=True)
55+
print("Templating...", end="")
5656
i = finger.image_2_tz(1)
5757
if i == adafruit_fingerprint.OK:
5858
print("Templated")
@@ -67,7 +67,7 @@ def get_fingerprint_detail():
6767
print("Other error")
6868
return False
6969

70-
print("Searching...", end="", flush=True)
70+
print("Searching...", end="")
7171
i = finger.finger_fast_search()
7272
# pylint: disable=no-else-return
7373
# This block needs to be refactored when it can be tested.
@@ -87,25 +87,25 @@ def enroll_finger(location):
8787
"""Take a 2 finger images and template it, then store in 'location'"""
8888
for fingerimg in range(1, 3):
8989
if fingerimg == 1:
90-
print("Place finger on sensor...", end="", flush=True)
90+
print("Place finger on sensor...", end="")
9191
else:
92-
print("Place same finger again...", end="", flush=True)
92+
print("Place same finger again...", end="")
9393

9494
while True:
9595
i = finger.get_image()
9696
if i == adafruit_fingerprint.OK:
9797
print("Image taken")
9898
break
9999
if i == adafruit_fingerprint.NOFINGER:
100-
print(".", end="", flush=True)
100+
print(".", end="")
101101
elif i == adafruit_fingerprint.IMAGEFAIL:
102102
print("Imaging error")
103103
return False
104104
else:
105105
print("Other error")
106106
return False
107107

108-
print("Templating...", end="", flush=True)
108+
print("Templating...", end="")
109109
i = finger.image_2_tz(fingerimg)
110110
if i == adafruit_fingerprint.OK:
111111
print("Templated")
@@ -126,7 +126,7 @@ def enroll_finger(location):
126126
while i != adafruit_fingerprint.NOFINGER:
127127
i = finger.get_image()
128128

129-
print("Creating model...", end="", flush=True)
129+
print("Creating model...", end="")
130130
i = finger.create_model()
131131
if i == adafruit_fingerprint.OK:
132132
print("Created")
@@ -137,7 +137,7 @@ def enroll_finger(location):
137137
print("Other error")
138138
return False
139139

140-
print("Storing model #%d..." % location, end="", flush=True)
140+
print("Storing model #%d..." % location, end="")
141141
i = finger.store_model(location)
142142
if i == adafruit_fingerprint.OK:
143143
print("Stored")

‎examples/fingerprint_r503_rpi.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def get_fingerprint():
4141
def get_fingerprint_detail():
4242
"""Get a finger print image, template it, and see if it matches!
4343
This time, print out each error instead of just returning on failure"""
44-
print("Getting image...", end="", flush=True)
44+
print("Getting image...", end="")
4545
i = finger.get_image()
4646
if i == adafruit_fingerprint.OK:
4747
print("Image taken")
@@ -54,7 +54,7 @@ def get_fingerprint_detail():
5454
print("Other error")
5555
return False
5656

57-
print("Templating...", end="", flush=True)
57+
print("Templating...", end="")
5858
i = finger.image_2_tz(1)
5959
if i == adafruit_fingerprint.OK:
6060
print("Templated")
@@ -69,7 +69,7 @@ def get_fingerprint_detail():
6969
print("Other error")
7070
return False
7171

72-
print("Searching...", end="", flush=True)
72+
print("Searching...", end="")
7373
i = finger.finger_fast_search()
7474
# pylint: disable=no-else-return
7575
# This block needs to be refactored when it can be tested.
@@ -89,25 +89,25 @@ def enroll_finger(location):
8989
"""Take a 2 finger images and template it, then store in 'location'"""
9090
for fingerimg in range(1, 3):
9191
if fingerimg == 1:
92-
print("Place finger on sensor...", end="", flush=True)
92+
print("Place finger on sensor...", end="")
9393
else:
94-
print("Place same finger again...", end="", flush=True)
94+
print("Place same finger again...", end="")
9595

9696
while True:
9797
i = finger.get_image()
9898
if i == adafruit_fingerprint.OK:
9999
print("Image taken")
100100
break
101101
if i == adafruit_fingerprint.NOFINGER:
102-
print(".", end="", flush=True)
102+
print(".", end="")
103103
elif i == adafruit_fingerprint.IMAGEFAIL:
104104
print("Imaging error")
105105
return False
106106
else:
107107
print("Other error")
108108
return False
109109

110-
print("Templating...", end="", flush=True)
110+
print("Templating...", end="")
111111
i = finger.image_2_tz(fingerimg)
112112
if i == adafruit_fingerprint.OK:
113113
print("Templated")
@@ -128,7 +128,7 @@ def enroll_finger(location):
128128
while i != adafruit_fingerprint.NOFINGER:
129129
i = finger.get_image()
130130

131-
print("Creating model...", end="", flush=True)
131+
print("Creating model...", end="")
132132
i = finger.create_model()
133133
if i == adafruit_fingerprint.OK:
134134
print("Created")
@@ -139,7 +139,7 @@ def enroll_finger(location):
139139
print("Other error")
140140
return False
141141

142-
print("Storing model #%d..." % location, end="", flush=True)
142+
print("Storing model #%d..." % location, end="")
143143
i = finger.store_model(location)
144144
if i == adafruit_fingerprint.OK:
145145
print("Stored")
@@ -157,14 +157,14 @@ def enroll_finger(location):
157157

158158
def save_fingerprint_image(filename):
159159
"""Scan fingerprint then save image to filename."""
160-
print("Place finger on sensor...", end="", flush=True)
160+
print("Place finger on sensor...", end="")
161161
while True:
162162
i = finger.get_image()
163163
if i == adafruit_fingerprint.OK:
164164
print("Image taken")
165165
break
166166
if i == adafruit_fingerprint.NOFINGER:
167-
print(".", end="", flush=True)
167+
print(".", end="")
168168
elif i == adafruit_fingerprint.IMAGEFAIL:
169169
print("Imaging error")
170170
return False

‎examples/fingerprint_simpletest.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get_fingerprint():
4343
def get_fingerprint_detail():
4444
"""Get a finger print image, template it, and see if it matches!
4545
This time, print out each error instead of just returning on failure"""
46-
print("Getting image...", end="", flush=True)
46+
print("Getting image...", end="")
4747
i = finger.get_image()
4848
if i == adafruit_fingerprint.OK:
4949
print("Image taken")
@@ -56,7 +56,7 @@ def get_fingerprint_detail():
5656
print("Other error")
5757
return False
5858

59-
print("Templating...", end="", flush=True)
59+
print("Templating...", end="")
6060
i = finger.image_2_tz(1)
6161
if i == adafruit_fingerprint.OK:
6262
print("Templated")
@@ -71,7 +71,7 @@ def get_fingerprint_detail():
7171
print("Other error")
7272
return False
7373

74-
print("Searching...", end="", flush=True)
74+
print("Searching...", end="")
7575
i = finger.finger_fast_search()
7676
# pylint: disable=no-else-return
7777
# This block needs to be refactored when it can be tested.
@@ -91,25 +91,25 @@ def enroll_finger(location):
9191
"""Take a 2 finger images and template it, then store in 'location'"""
9292
for fingerimg in range(1, 3):
9393
if fingerimg == 1:
94-
print("Place finger on sensor...", end="", flush=True)
94+
print("Place finger on sensor...", end="")
9595
else:
96-
print("Place same finger again...", end="", flush=True)
96+
print("Place same finger again...", end="")
9797

9898
while True:
9999
i = finger.get_image()
100100
if i == adafruit_fingerprint.OK:
101101
print("Image taken")
102102
break
103103
if i == adafruit_fingerprint.NOFINGER:
104-
print(".", end="", flush=True)
104+
print(".", end="")
105105
elif i == adafruit_fingerprint.IMAGEFAIL:
106106
print("Imaging error")
107107
return False
108108
else:
109109
print("Other error")
110110
return False
111111

112-
print("Templating...", end="", flush=True)
112+
print("Templating...", end="")
113113
i = finger.image_2_tz(fingerimg)
114114
if i == adafruit_fingerprint.OK:
115115
print("Templated")
@@ -130,7 +130,7 @@ def enroll_finger(location):
130130
while i != adafruit_fingerprint.NOFINGER:
131131
i = finger.get_image()
132132

133-
print("Creating model...", end="", flush=True)
133+
print("Creating model...", end="")
134134
i = finger.create_model()
135135
if i == adafruit_fingerprint.OK:
136136
print("Created")
@@ -141,7 +141,7 @@ def enroll_finger(location):
141141
print("Other error")
142142
return False
143143

144-
print("Storing model #%d..." % location, end="", flush=True)
144+
print("Storing model #%d..." % location, end="")
145145
i = finger.store_model(location)
146146
if i == adafruit_fingerprint.OK:
147147
print("Stored")

‎examples/fingerprint_simpletest_rpi.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def get_fingerprint():
4242
def get_fingerprint_detail():
4343
"""Get a finger print image, template it, and see if it matches!
4444
This time, print out each error instead of just returning on failure"""
45-
print("Getting image...", end="", flush=True)
45+
print("Getting image...", end="")
4646
i = finger.get_image()
4747
if i == adafruit_fingerprint.OK:
4848
print("Image taken")
@@ -55,7 +55,7 @@ def get_fingerprint_detail():
5555
print("Other error")
5656
return False
5757

58-
print("Templating...", end="", flush=True)
58+
print("Templating...", end="")
5959
i = finger.image_2_tz(1)
6060
if i == adafruit_fingerprint.OK:
6161
print("Templated")
@@ -70,7 +70,7 @@ def get_fingerprint_detail():
7070
print("Other error")
7171
return False
7272

73-
print("Searching...", end="", flush=True)
73+
print("Searching...", end="")
7474
i = finger.finger_fast_search()
7575
# pylint: disable=no-else-return
7676
# This block needs to be refactored when it can be tested.
@@ -90,25 +90,25 @@ def enroll_finger(location):
9090
"""Take a 2 finger images and template it, then store in 'location'"""
9191
for fingerimg in range(1, 3):
9292
if fingerimg == 1:
93-
print("Place finger on sensor...", end="", flush=True)
93+
print("Place finger on sensor...", end="")
9494
else:
95-
print("Place same finger again...", end="", flush=True)
95+
print("Place same finger again...", end="")
9696

9797
while True:
9898
i = finger.get_image()
9999
if i == adafruit_fingerprint.OK:
100100
print("Image taken")
101101
break
102102
if i == adafruit_fingerprint.NOFINGER:
103-
print(".", end="", flush=True)
103+
print(".", end="")
104104
elif i == adafruit_fingerprint.IMAGEFAIL:
105105
print("Imaging error")
106106
return False
107107
else:
108108
print("Other error")
109109
return False
110110

111-
print("Templating...", end="", flush=True)
111+
print("Templating...", end="")
112112
i = finger.image_2_tz(fingerimg)
113113
if i == adafruit_fingerprint.OK:
114114
print("Templated")
@@ -129,7 +129,7 @@ def enroll_finger(location):
129129
while i != adafruit_fingerprint.NOFINGER:
130130
i = finger.get_image()
131131

132-
print("Creating model...", end="", flush=True)
132+
print("Creating model...", end="")
133133
i = finger.create_model()
134134
if i == adafruit_fingerprint.OK:
135135
print("Created")
@@ -140,7 +140,7 @@ def enroll_finger(location):
140140
print("Other error")
141141
return False
142142

143-
print("Storing model #%d..." % location, end="", flush=True)
143+
print("Storing model #%d..." % location, end="")
144144
i = finger.store_model(location)
145145
if i == adafruit_fingerprint.OK:
146146
print("Stored")

‎examples/fingerprint_template_file_compare.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def fingerprint_check_file():
6363
if finger.image_2_tz(1) != adafruit_fingerprint.OK:
6464
return False
6565

66-
print("Loading file template...", end="", flush=True)
66+
print("Loading file template...", end="")
6767
with open("template0.dat", "rb") as file:
6868
data = file.read()
6969
finger.send_fpdata(list(data), "char", 2)
@@ -87,17 +87,17 @@ def enroll_save_to_file():
8787
set_led_local(color=3, mode=1)
8888
for fingerimg in range(1, 3):
8989
if fingerimg == 1:
90-
print("Place finger on sensor...", end="", flush=True)
90+
print("Place finger on sensor...", end="")
9191
else:
92-
print("Place same finger again...", end="", flush=True)
92+
print("Place same finger again...", end="")
9393

9494
while True:
9595
i = finger.get_image()
9696
if i == adafruit_fingerprint.OK:
9797
print("Image taken")
9898
break
9999
if i == adafruit_fingerprint.NOFINGER:
100-
print(".", end="", flush=True)
100+
print(".", end="")
101101
elif i == adafruit_fingerprint.IMAGEFAIL:
102102
set_led_local(color=1, mode=2, speed=20, cycles=10)
103103
print("Imaging error")
@@ -107,7 +107,7 @@ def enroll_save_to_file():
107107
print("Other error")
108108
return False
109109

110-
print("Templating...", end="", flush=True)
110+
print("Templating...", end="")
111111
i = finger.image_2_tz(fingerimg)
112112
if i == adafruit_fingerprint.OK:
113113
print("Templated")
@@ -131,7 +131,7 @@ def enroll_save_to_file():
131131
while i != adafruit_fingerprint.NOFINGER:
132132
i = finger.get_image()
133133

134-
print("Creating model...", end="", flush=True)
134+
print("Creating model...", end="")
135135
i = finger.create_model()
136136
if i == adafruit_fingerprint.OK:
137137
print("Created")

0 commit comments

Comments
 (0)