Skip to content

Commit 6a986bb

Browse files
committed
remove str dunder
1 parent ed1624d commit 6a986bb

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

lightbug_api/app.mojo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct App[docs_enabled: Bool = False]:
6868
with open((lightbug_dir / "routes.json"), "w") as f:
6969
f.write(to_string[pretty=True](routes_obj))
7070

71-
var mojodoc_status = external_call["system", UInt8]("magic run mojo doc ./lightbug.🔥 -o " + lightbug_dir.__str__() + "/mojodoc.json")
71+
var mojodoc_status = external_call["system", UInt8]("magic run mojo doc ./lightbug.🔥 -o " + str(lightbug_dir) + "/mojodoc.json")
7272
if mojodoc_status != 0:
7373
logger.error("Failed to generate mojodoc.json")
7474
return
@@ -77,16 +77,16 @@ struct App[docs_enabled: Bool = False]:
7777
var generator = OpenAPIGenerator()
7878

7979
var mojo_doc_json = generator.read_mojo_doc(
80-
(self.lightbug_dir / "mojodoc.json").__str__()
80+
str(self.lightbug_dir / "mojodoc.json")
8181
)
8282
var router_metadata_json = generator.read_router_metadata(
83-
(self.lightbug_dir / "routes.json").__str__()
83+
str(self.lightbug_dir / "routes.json")
8484
)
8585

8686
var openapi_spec = generator.generate_spec(mojo_doc_json, router_metadata_json)
8787
generator.save_spec(
8888
openapi_spec,
89-
(self.lightbug_dir / "openapi_spec.json").__str__()
89+
str(self.lightbug_dir / "openapi_spec.json")
9090
)
9191
return openapi_spec
9292

lightbug_api/openapi/generate.mojo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ struct OpenAPIGenerator:
1919
var routes = router_metadata["routes"][Array]._data
2020
for i in range(len(routes)):
2121
var route = routes[i][Object]
22-
var handler = route["handler"].__str__().strip('"')
22+
var handler = str(route["handler"]).strip('"')
2323
var path = route["path"][String].strip('"')
2424
var method = String(route["method"][String].strip('"')).lower()
2525
route_map[handler] = (String(path), method)
2626

2727
for func in mojo_doc["decl"][Object]["functions"][Array]._data:
28-
var func_name = func[][Object]["name"].__str__().strip('"')
28+
var func_name = str(func[][Object]["name"]).strip('"')
2929

3030
if func_name not in route_map:
3131
continue
@@ -57,7 +57,7 @@ struct OpenAPIGenerator:
5757
fn create_endpoint(mut self, function_data: JSON, http_method: String) raises -> JSON:
5858
var endpoint = JSON()
5959
var func_name = function_data["name"]
60-
endpoint["summary"] = String(func_name.__str__().strip('"')) + " endpoint"
60+
endpoint["summary"] = String(str(func_name).strip('"')) + " endpoint"
6161
endpoint["operationId"] = func_name
6262

6363
var responses = JSON()
@@ -71,19 +71,19 @@ struct OpenAPIGenerator:
7171
for i in range(len(overloads)):
7272
var overload = overloads[i][Array][0] # first overload only for now
7373
if "returnsDoc" in overload[Object]._data:
74-
response_description = String(overload[Object]["returnsDoc"].__str__().strip('"'))
74+
response_description = String(str(overload[Object]["returnsDoc"]).strip('"'))
7575
if "summary" in overload[Object]._data:
76-
endpoint["description"] = String(overload[Object]["summary"].__str__().strip('"'))
77-
if "description" in overload[Object]._data and overload[Object]["description"].__str__().__contains__("Tags:"):
78-
var description = overload[Object]["description"].__str__()
76+
endpoint["description"] = String(str(overload[Object]["summary"]).strip('"'))
77+
if "description" in overload[Object]._data and str(overload[Object]["description"]).__contains__("Tags:"):
78+
var description = str(overload[Object]["description"])
7979
var tags_part = description.split("Tags:")[1]
8080
var tags_str = String(tags_part.strip().rstrip('."'))
8181
var tags = tags_str.split(",")
8282
var tag_values = List[Value]()
8383
for tag in tags:
8484
var stripped_tag = String(tag[].strip()).replace("\\n", "").replace("\\t", "").replace("\\r", "")
8585
var cleaned_tag = stripped_tag.strip(" ")
86-
tag_values.append(Value(cleaned_tag.__str__()))
86+
tag_values.append(Value(str(cleaned_tag)))
8787

8888
self.set_tags(tag_values)
8989
endpoint["tags"] = Array(tag_values)
@@ -93,7 +93,7 @@ struct OpenAPIGenerator:
9393
for i in range(len(args)):
9494
var arg = args[0][Array][i][Object]
9595
if "description" in arg._data:
96-
request_description = String(arg["description"].__str__().strip('"'))
96+
request_description = String(str(arg["description"]).strip('"'))
9797
break
9898

9999
response_200["description"] = response_description

tests/lightbug_api/test_generate.mojo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ def test_endpoint_tags():
123123
assert_true("tags" in endpoint)
124124
var tag_array = endpoint["tags"][Array]
125125
assert_equal(len(tag_array), 3)
126-
assert_equal(tag_array[0].__str__(), '"api"')
127-
assert_equal(tag_array[1].__str__(), '"test"')
128-
assert_equal(tag_array[2].__str__(), '"auth"')
126+
assert_equal(str(tag_array[0]), '"api"')
127+
assert_equal(str(tag_array[1]), '"test"')
128+
assert_equal(str(tag_array[2]), '"auth"')
129129

130130
# Test 2: Tags with control characters
131131
var function_data_control_chars = JSON.from_string('''
@@ -147,9 +147,9 @@ def test_endpoint_tags():
147147
assert_true("tags" in endpoint_control_chars)
148148
var tag_array_control_chars = endpoint_control_chars["tags"][Array]
149149
assert_equal(len(tag_array_control_chars), 3)
150-
assert_equal(tag_array_control_chars[0].__str__(), '"hello"')
151-
assert_equal(tag_array_control_chars[1].__str__(), '"what"')
152-
assert_equal(tag_array_control_chars[2].__str__(), '"up"')
150+
assert_equal(str(tag_array_control_chars[0]), '"hello"')
151+
assert_equal(str(tag_array_control_chars[1]), '"what"')
152+
assert_equal(str(tag_array_control_chars[2]), '"up"')
153153

154154
# Test 3: Tags with extra whitespace
155155
var function_data_whitespace = JSON.from_string("""
@@ -171,9 +171,9 @@ def test_endpoint_tags():
171171
assert_true("tags" in endpoint_whitespace)
172172
var tag_array_whitespace = endpoint_whitespace["tags"][Array]
173173
assert_equal(len(tag_array_whitespace), 3)
174-
assert_equal(tag_array_whitespace[0].__str__(), '"api"')
175-
assert_equal(tag_array_whitespace[1].__str__(), '"test"')
176-
assert_equal(tag_array_whitespace[2].__str__(), '"auth"')
174+
assert_equal(str(tag_array_whitespace[0]), '"api"')
175+
assert_equal(str(tag_array_whitespace[1]), '"test"')
176+
assert_equal(str(tag_array_whitespace[2]), '"auth"')
177177

178178
# Test 4: No tags
179179
var function_data_no_tags = JSON.from_string("""

0 commit comments

Comments
 (0)