Skip to content

Commit a329574

Browse files
committed
Removed pretty print as an attribute of Csskrt
1 parent 95f0b8d commit a329574

4 files changed

Lines changed: 11 additions & 14 deletions

File tree

csskrt/bootstrapCsskrt.py

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

44

55
class BootstrapCsskrt(Csskrt):
6-
def __init__(self, fileName, pretty_print):
6+
def __init__(self, fileName):
77
tag_styles = {
88
'input': 'form-control',
99
'select': 'custom-select',
1010
'button': 'btn btn-primary',
1111
'checkbox': 'form-check-input',
1212
}
13-
super().__init__(fileName, pretty_print, tag_styles)
13+
super().__init__(fileName, tag_styles)
1414

1515
def version(self):
1616
return "v4.1"

csskrt/bulmaCsskrt.py

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

44

55
class BulmaCsskrt(Csskrt):
6-
def __init__(self, fileName, pretty_print):
6+
def __init__(self, fileName):
77
tag_styles = {
88
'input': 'input',
99
'label': 'label',
@@ -19,7 +19,7 @@ def __init__(self, fileName, pretty_print):
1919
'h5': 'title is-5',
2020
'h6': 'title is-6'
2121
}
22-
super().__init__(fileName, pretty_print, tag_styles)
22+
super().__init__(fileName, tag_styles)
2323

2424
def version(self):
2525
return "v0.7.1"

csskrt/csskrt.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55

66

77
class Csskrt(ABC):
8-
def __init__(self, filename: str, pretty_print, tag_styles: Dict):
8+
def __init__(self, filename: str, tag_styles: Dict):
99
f = open(filename) # should be able to handle dirs (for later) todo
1010
f_data = f.read()
1111

12-
self.pretty_print = pretty_print
1312
self.file_path = filename
1413
self.soup = BeautifulSoup(f_data, 'html.parser')
1514
self.tag_styles = tag_styles
@@ -149,7 +148,6 @@ def add_list_classes(self, list_tags: dict) -> NoReturn:
149148
# recursive=False to prevent double modifying for nested lists
150149
self.add_class_to_element(li, list_tags['li'])
151150

152-
153151
def add_general_classes(self):
154152
"""
155153
Adds styles to single elements
@@ -163,7 +161,7 @@ def add_general_classes(self):
163161
for elem in self.soup.find_all(tag):
164162
self.add_class_to_element(elem, self.tag_styles[tag])
165163

166-
def output(self) -> NoReturn:
164+
def output(self, pretty_print: bool) -> NoReturn:
167165
"""
168166
Outputs a new file.
169167
:return:
@@ -174,7 +172,7 @@ def output(self) -> NoReturn:
174172

175173
new_file_name = os.path.join(folder, 'output/csskrt_' + file_name + ext)
176174
with open(new_file_name, 'w') as out_file:
177-
if self.pretty_print:
175+
if pretty_print:
178176
out_file.write(str(self.soup))
179177
else:
180178
out_file.write(self.soup.prettify())
@@ -206,4 +204,4 @@ def freshify(self) -> NoReturn:
206204
# Add styles for the rest of the elements
207205
self.add_general_classes()
208206

209-
return self.soup
207+
return self.soup

csskrt/main.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ def freshify(filename, framework, pretty_print):
1414
csskrter = None
1515

1616
if framework == 'bootstrap':
17-
csskrter = BootstrapCsskrt(filename, pretty_print)
17+
csskrter = BootstrapCsskrt(filename)
1818
elif framework == 'bulma':
19-
csskrter = BulmaCsskrt(filename, pretty_print)
20-
19+
csskrter = BulmaCsskrt(filename)
2120

2221
csskrter.freshify()
23-
csskrter.output()
22+
csskrter.output(pretty_print)
2423
print()
2524
print("~~~ Done! ~~~~")
2625

0 commit comments

Comments
 (0)