fix packaging errors

Author: saviorand

external/libc.mojo

@@ -11,7 +11,7 @@ alias FD_STDERR: c_int = 2
 alias SUCCESS = 0
 alias GRND_NONBLOCK: UInt8 = 1
 
-alias char_pointer = AnyPointer[c_char]
+alias char_pointer = UnsafePointer[c_char]
 
 # Adapted from https://github.com/crisadamo/mojo-Libc . Huge thanks to Cristian!
 # C types

lightbug.🔥

@@ -1,6 +1,14 @@
 from lightbug_http import *
+from sys import is_defined
 
 fn main() raises:
-    var server = SysServer()
-    var handler = Welcome()
-    server.listen_and_serve("0.0.0.0:8080", handler)
+    if is_defined["TEST"]():
+        try:
+            run_tests()
+            print("Test suite passed")
+        except e:
+            print("Test suite failed: " + e.__str__())
+    else:
+        var server = SysServer()
+        var handler = Welcome()
+        server.listen_and_serve("0.0.0.0:8080", handler)

lightbug_http/__init__.mojo

@@ -1,7 +1,7 @@
 from lightbug_http.http import HTTPRequest, HTTPResponse, OK
 from lightbug_http.service import HTTPService, Welcome
 from lightbug_http.sys.server import SysServer
-
+from lightbug_http.tests.run import run_tests
 
 trait DefaultConstructible:
     fn __init__(inout self) raises:

lightbug_http/http.mojo

@@ -1,10 +1,6 @@
 from time import now
 from external.morrow import Morrow
-
 from external.gojo.strings import StringBuilder
-
-# from external.gojo.builtins import Bytes
-# import external.gojo.io
 from lightbug_http.uri import URI
 from lightbug_http.io.bytes import Bytes
 from lightbug_http.header import RequestHeader, ResponseHeader

lightbug_http/python/__init__.mojo

@@ -6,16 +6,24 @@ struct Modules:
     var builtins: PythonObject
     var socket: PythonObject
 
-    fn __init__(inout self) raises -> None:
+    fn __init__(inout self) -> None:
         self.builtins = self.__load_builtins()
         self.socket = self.__load_socket()
 
     @staticmethod
-    fn __load_socket() raises -> PythonObject:
-        var socket = Python.import_module("socket")
-        return socket
+    fn __load_socket() -> PythonObject:
+        try:
+            var socket = Python.import_module("socket")
+            return socket
+        except e:
+            print("Failed to import socket module")
+            return None
 
     @staticmethod
-    fn __load_builtins() raises -> PythonObject:
-        var builtins = Python.import_module("builtins")
-        return builtins
+    fn __load_builtins() -> PythonObject:
+        try:
+            var builtins = Python.import_module("builtins")
+            return builtins
+        except e:
+            print("Failed to import builtins module")
+            return None

lightbug_http/python/net.mojo

@@ -42,7 +42,7 @@ struct PythonTCPListener:
         self.socket = socket
 
     @always_inline
-    fn accept[T: Connection](self) raises -> T:
+    fn accept(self) raises -> PythonConnection:
         var conn_addr = self.socket.accept()
         return PythonConnection(self.__pymodules, conn_addr)
 
@@ -55,16 +55,16 @@ struct PythonTCPListener:
         return self.__addr
 
 
-struct PythonListenConfig(ListenConfig):
+struct PythonListenConfig:
     var __pymodules: Modules
     var __keep_alive: Duration
 
-    fn __init__(inout self) raises:
-        self.__keep_alive = Duration(default_tcp_keep_alive)
+    fn __init__(inout self):
+        self.__keep_alive = default_tcp_keep_alive
         self.__pymodules = Modules()
 
-    fn __init__(inout self, keep_alive: Duration) raises:
-        self.__keep_alive = Duration(keep_alive)
+    fn __init__(inout self, keep_alive: Duration):
+        self.__keep_alive = keep_alive
         self.__pymodules = Modules()
 
     fn listen(inout self, network: String, address: String) raises -> PythonTCPListener:
@@ -132,14 +132,11 @@ struct PythonConnection(Connection):
         return TCPAddr(self.raddr[0].__str__(), self.raddr[1].__int__())
 
 
-struct PythonNet(Net):
+struct PythonNet:
     var __lc: PythonListenConfig
 
     fn __init__(inout self):
-        try:
-            self.__lc = PythonListenConfig(default_tcp_keep_alive)
-        except e:
-            print("Could not initialize PythonListenConfig: " + e.__str__())
+        self.__lc = PythonListenConfig(default_tcp_keep_alive)
 
     fn __init__(inout self, keep_alive: Duration) raises:
         self.__lc = PythonListenConfig(keep_alive)

lightbug_http/python/server.mojo

@@ -67,7 +67,7 @@ struct PythonServer:
         self.ln = ln
 
         while True:
-            var conn = self.ln.accept[PythonConnection]()
+            var conn = self.ln.accept()
             var buf = Bytes()
             var read_len = conn.read(buf)
             var first_line_and_headers = next_line(buf)

lightbug_http/sys/net.mojo

@@ -232,7 +232,7 @@ struct SysConnection(Connection):
         return self.raddr
 
 
-struct SysNet(Net):
+struct SysNet:
     var __lc: SysListenConfig
 
     fn __init__(inout self) raises:
@@ -409,7 +409,7 @@ fn create_connection(sock: c_int, host: String, port: UInt16) raises -> SysConne
     print("Connected to server at " + host + ":" + port.__str__())
 
     var laddr = TCPAddr()
-    var raddr = TCPAddr(host, port.to_int())
+    var raddr = TCPAddr(host, int(port))
     var conn = SysConnection(sock, laddr, raddr)
 
     return conn

lightbug_http/tests/run.mojo

@@ -17,11 +17,3 @@ fn run_client_tests() raises:
     # test_mojo_client_lightbug_external_req(mojo_client)
     test_mojo_client_lightbug(mojo_client)
     test_python_client_lightbug(py_client)
-
-
-fn main():
-    try:
-        run_tests()
-        print("Test suite passed")
-    except e:
-        print("Test suite failed: " + e.__str__())

lightbug_http/tests/utils.mojo

@@ -113,10 +113,7 @@ struct FakeServer(ServerTrait):
     fn __init__(
         inout self, addr: String, service: HTTPService, error_handler: ErrorHandler
     ):
-        try:
-            self.__listener = FakeListener()
-        except e:
-            print(e)
+        self.__listener = FakeListener()
         self.__handler = FakeResponder()
 
     fn get_concurrency(self) -> Int:
@@ -128,7 +125,7 @@ struct FakeServer(ServerTrait):
     fn serve(inout self) -> None:
         while not self.__listener.closed:
             try:
-                _ = self.__listener.accept[FakeConnection]()
+                _ = self.__listener.accept()
             except e:
                 print(e)
 
@@ -175,23 +172,23 @@ struct FakeListener:
     var request: Bytes
     var closed: Bool
 
-    fn __init__(inout self) raises:
+    fn __init__(inout self):
         self.request_count = 0
         self.request = Bytes()
         self.closed = False
 
-    fn __init__(inout self, addr: TCPAddr) raises:
+    fn __init__(inout self, addr: TCPAddr):
         self.request_count = 0
         self.request = Bytes()
         self.closed = False
 
-    fn __init__(inout self, request_count: Int, request: Bytes) -> None:
+    fn __init__(inout self, request_count: Int, request: Bytes):
         self.request_count = request_count
         self.request = request
         self.closed = False
 
     @always_inline
-    fn accept[T: Connection](self) raises -> T:
+    fn accept(self) raises -> FakeConnection:
         return FakeConnection()
 
     fn close(self) raises: