Skip to content

Commit 033650e

Browse files
jkonecny12jkonecny12
authored
Merge pull request #113 from jkonecny12/master-fix-pylint
Fix pylint issues in 2.10.2 version
2 parents 6113c0c + cb816bc commit 033650e

File tree

12 files changed

+99
-99
lines changed

12 files changed

+99
-99
lines changed

‎examples/00_basic/00_basic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HelloWorld(UIScreen):
3535

3636
def __init__(self):
3737
# Set title of the screen.
38-
super().__init__(title=u"Hello World")
38+
super().__init__(title="Hello World")
3939

4040
def refresh(self, args=None):
4141
# Fill the self.window attribute by the WindowContainer and set screen title as header.

‎examples/01_base_widgets/01_base_widgets.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class HelloWorld(UIScreen):
3333

3434
def __init__(self):
3535
# Set title of the screen.
36-
super().__init__(title=u"Show Widgets")
36+
super().__init__(title="Show Widgets")
3737

3838
def refresh(self, args=None):
3939
super().refresh()

‎examples/06_glib_loop/06_glib_loop.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
class HelloWorld(UIScreen):
4242

4343
def __init__(self):
44-
super().__init__(title=u"Hello World with GLib")
44+
super().__init__(title="Hello World with GLib")
4545

4646
def refresh(self, args=None):
4747
super().refresh()

‎examples/07_divider/07_divider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DividerScreen(UIScreen):
3636

3737
def __init__(self):
3838
# Set title of the screen.
39-
super().__init__(title=u"Divider")
39+
super().__init__(title="Divider")
4040
self._message = 0
4141

4242
def refresh(self, args=None):

‎simpleline/render/adv_widgets.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def refresh(self, args=None):
173173
help_message = _("The help is not available.")
174174

175175
if self.help_path:
176-
with open(self.help_path, 'r') as f:
176+
with open(self.help_path, 'r', encoding='utf-8') as f:
177177
help_message = f.read()
178178

179179
self.window.add_with_separator(widgets.TextWidget(help_message))

‎simpleline/render/prompt.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def __init__(self, message=DEFAULT_MESSAGE):
5656
:type message: str|None
5757
"""
5858
self.message = message
59-
self.options = dict()
59+
self.options = {}
6060

6161
def set_message(self, message):
6262
"""Set the prompt message.

‎simpleline/render/screen/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def _print_widget(self, widget):
235235

236236
if num_lines < real_screen_height:
237237
# widget plus prompt are shorter than screen height, just print the widget
238-
print(u"\n".join(lines))
238+
print("\n".join(lines))
239239
return
240240

241241
# long widget, print it in steps and prompt user to continue

‎simpleline/render/widgets.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def width(self):
5959

6060
def clear(self):
6161
"""Clears this widgets buffer and resets cursor."""
62-
self._buffer = list()
62+
self._buffer = []
6363
self._cursor = (0, 0)
6464

6565
@property
@@ -84,7 +84,7 @@ def get_lines(self):
8484
:return: lines representing this widget
8585
:rtype: list(str)
8686
"""
87-
return [str(u"".join(line)) for line in self._buffer]
87+
return [str("".join(line)) for line in self._buffer]
8888

8989
def set_cursor_position(self, row, col):
9090
"""Set cursor position.
@@ -131,14 +131,14 @@ def draw(self, w, row=None, col=None, block=False):
131131
# fill up rows to accommodate for w.height
132132
if self.height < row + w.height:
133133
for _i in range(row + w.height - self.height):
134-
self._buffer.append(list())
134+
self._buffer.append([])
135135

136136
# append columns to accommodate for w.width
137137
for l in range(row, row + w.height):
138138
l_len = len(self._buffer[l])
139139
w_len = len(w.content[l - row])
140140
if l_len < col + w_len:
141-
self._buffer[l] += ((col + w_len - l_len) * list(u" "))
141+
self._buffer[l] += ((col + w_len - l_len) * [" "])
142142
self._buffer[l][col:col + w_len] = w.content[l - row][:]
143143

144144
# move the cursor to new spot
@@ -220,11 +220,11 @@ def write(self, text, row=None, col=None, width=None, block=False, wordwrap=Fals
220220
def _increase_x_buffer_size(self, x):
221221
if x >= len(self._buffer):
222222
for _i in range(x - len(self._buffer) + 1):
223-
self._buffer.append(list())
223+
self._buffer.append([])
224224

225225
def _increase_y_buffer_size(self, x, y):
226226
if y >= len(self._buffer[x]):
227-
self._buffer[x] += ((y - len(self._buffer[x]) + 1) * list(u" "))
227+
self._buffer[x] += ((y - len(self._buffer[x]) + 1) * [" "])
228228

229229
def _save_character_to_buffer(self, x, y, character):
230230
self._buffer[x][y] = character
@@ -342,8 +342,8 @@ def write(self, text, row=None, col=None, width=None, block=False, wordwrap=Fals
342342
To print just a blank line we don't need too much logic.
343343
"""
344344
for i in range(0, self._lines):
345-
self._buffer.append(list())
346-
self._buffer[i] += u""
345+
self._buffer.append([])
346+
self._buffer[i] += ""
347347
self.set_cursor_position(self._lines - 1, 0)
348348

349349

‎tests/units/main/containers_test.py‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ def test_listrow_container(self):
4545
numbering=False)
4646
c.render(25)
4747

48-
expected_result = [u"Test Test 2",
49-
u"Test 3"]
48+
expected_result = ["Test Test 2",
49+
"Test 3"]
5050
res_lines = c.get_lines()
5151

5252
self.evaluate_result(res_lines, expected_result)
@@ -63,7 +63,7 @@ def test_more_columns_than_widgets(self):
6363
c = ListRowContainer(columns=3, items=[self.w1], columns_width=40, numbering=False)
6464
c.render(80)
6565

66-
expected_result = [u"Můj krásný dlouhý text"]
66+
expected_result = ["Můj krásný dlouhý text"]
6767

6868
res_lines = c.get_lines()
6969
self.evaluate_result(res_lines, expected_result)
@@ -76,10 +76,10 @@ def test_listrow_wrapping(self):
7676
numbering=False)
7777
c.render(25)
7878

79-
expected_result = [u"Můj krásný Test",
80-
u"dlouhý text",
81-
u"Test 2 Krásný dlouhý",
82-
u" text podruhé"]
79+
expected_result = ["Můj krásný Test",
80+
"dlouhý text",
81+
"Test 2 Krásný dlouhý",
82+
" text podruhé"]
8383
res_lines = c.get_lines()
8484
self.evaluate_result(res_lines, expected_result)
8585

@@ -90,10 +90,10 @@ def test_newline_wrapping(self):
9090
c = ListRowContainer(3, widgets, columns_width=6, spacing=1, numbering=False)
9191
c.render(80)
9292

93-
expected_result = [u"Hello Wrap Hi",
94-
u" this",
95-
u" text",
96-
u"Hello2"]
93+
expected_result = ["Hello Wrap Hi",
94+
" this",
95+
" text",
96+
"Hello2"]
9797
res_lines = c.get_lines()
9898
self.evaluate_result(res_lines, expected_result)
9999

@@ -105,8 +105,8 @@ def test_listcolumn_container(self):
105105
numbering=False)
106106
c.render(25)
107107

108-
expected_result = [u"Test Test 3",
109-
u"Test 2"]
108+
expected_result = ["Test Test 3",
109+
"Test 2"]
110110
res_lines = c.get_lines()
111111
self.evaluate_result(res_lines, expected_result)
112112

@@ -118,10 +118,10 @@ def test_listcolumn_wrapping(self):
118118
numbering=False)
119119
c.render(25)
120120

121-
expected_result = [u"Můj krásný Test 2",
122-
u"dlouhý text",
123-
u"Test Krásný dlouhý",
124-
u" text podruhé"]
121+
expected_result = ["Můj krásný Test 2",
122+
"dlouhý text",
123+
"Test Krásný dlouhý",
124+
" text podruhé"]
125125
res_lines = c.get_lines()
126126
self.evaluate_result(res_lines, expected_result)
127127

@@ -132,16 +132,16 @@ def test_add_new_container(self):
132132
spacing=0,
133133
numbering=False)
134134

135-
expected_result = [u"Ahoj"]
135+
expected_result = ["Ahoj"]
136136

137137
c.render(80)
138138
self.evaluate_result(c.get_lines(), expected_result)
139139

140140
c.add(TextWidget("Nový widget"))
141141
c.add(TextWidget("Hello"))
142142

143-
expected_result = [u"Ahoj Nový widget",
144-
u"Hello"]
143+
expected_result = ["Ahoj Nový widget",
144+
"Hello"]
145145

146146
c.render(80)
147147
self.evaluate_result(c.get_lines(), expected_result)
@@ -151,10 +151,10 @@ def test_column_numbering(self):
151151
c = ListColumnContainer(2, [self.w1, self.w2, self.w3, self.w4], columns_width=16)
152152
c.render(25)
153153

154-
expected_result = [u"1) Můj krásný 3) Test 2",
155-
u" dlouhý text",
156-
u"2) Test 4) Krásný dlouhý",
157-
u" text podruhé"]
154+
expected_result = ["1) Můj krásný 3) Test 2",
155+
" dlouhý text",
156+
"2) Test 4) Krásný dlouhý",
157+
" text podruhé"]
158158
res_lines = c.get_lines()
159159
self.evaluate_result(res_lines, expected_result)
160160

@@ -163,10 +163,10 @@ def test_row_numbering(self):
163163
c = ListRowContainer(2, [self.w1, self.w2, self.w3, self.w4], columns_width=16)
164164
c.render(25)
165165

166-
expected_result = [u"1) Můj krásný 2) Test",
167-
u" dlouhý text",
168-
u"3) Test 2 4) Krásný dlouhý",
169-
u" text podruhé"]
166+
expected_result = ["1) Můj krásný 2) Test",
167+
" dlouhý text",
168+
"3) Test 2 4) Krásný dlouhý",
169+
" text podruhé"]
170170
res_lines = c.get_lines()
171171
self.evaluate_result(res_lines, expected_result)
172172

@@ -176,10 +176,10 @@ def test_custom_numbering(self):
176176
c.key_pattern = KeyPattern("a {:d} a ")
177177
c.render(25)
178178

179-
expected_result = [u"a 1 a Můj krásný a 2 a Test",
180-
u" dlouhý text",
181-
u"a 3 a Test 2 a 4 a Krásný dlouhý",
182-
u" text podruhé"]
179+
expected_result = ["a 1 a Můj krásný a 2 a Test",
180+
" dlouhý text",
181+
"a 3 a Test 2 a 4 a Krásný dlouhý",
182+
" text podruhé"]
183183
res_lines = c.get_lines()
184184
self.evaluate_result(res_lines, expected_result)
185185

@@ -189,9 +189,9 @@ def test_window_container(self):
189189
c.add(TextWidget("Body"))
190190
c.render(10)
191191

192-
expected_result = [u"Test",
193-
u"",
194-
u"Body"]
192+
expected_result = ["Test",
193+
"",
194+
"Body"]
195195

196196
res_lines = c.get_lines()
197197
self.evaluate_result(res_lines, expected_result)
@@ -203,10 +203,10 @@ def test_window_container_with_multiple_items(self):
203203
c.add(TextWidget("Body second line"))
204204
c.render(30)
205205

206-
expected_result = [u"Test",
207-
u"",
208-
u"Body",
209-
u"Body second line"]
206+
expected_result = ["Test",
207+
"",
208+
"Body",
209+
"Body second line"]
210210

211211
res_lines = c.get_lines()
212212
self.evaluate_result(res_lines, expected_result)
@@ -218,12 +218,12 @@ def test_window_container_wrapping(self):
218218
c.add(TextWidget("Body"))
219219
c.render(5)
220220

221-
expected_result = [u"Test",
222-
u"",
223-
u"Body",
224-
u"long",
225-
u"line",
226-
u"Body"]
221+
expected_result = ["Test",
222+
"",
223+
"Body",
224+
"long",
225+
"line",
226+
"Body"]
227227

228228
res_lines = c.get_lines()
229229
self.evaluate_result(res_lines, expected_result)
@@ -243,9 +243,9 @@ def test_list_container_without_width(self):
243243
render_width = (column_count * expected_col_width) + expected_spacing_sum
244244
c.render(render_width)
245245

246-
expected_result = [u"AAAA BBBB CCCC",
247-
u" C",
248-
u"DDDD"]
246+
expected_result = ["AAAA BBBB CCCC",
247+
" C",
248+
"DDDD"]
249249

250250
res_lines = c.get_lines()
251251
self.evaluate_result(res_lines, expected_result)

‎tests/units/main/prompt_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def test_prompt_message(self):
3333
p.set_message("Brand new message")
3434
self.assertEqual(p.message, "Brand new message")
3535

36-
p.set_message(u"Žluťoučký kůň")
37-
self.assertEqual(p.message, u"Žluťoučký kůň")
36+
p.set_message("Žluťoučký kůň")
37+
self.assertEqual(p.message, "Žluťoučký kůň")
3838

3939
p2 = Prompt("Default prompt text")
4040
self.assertEqual(p2.message, "Default prompt text")

0 commit comments

Comments
 (0)