Use Import instead of ImportDefault

Author: dbrattli

src/Ast.fs

@@ -1,6 +1,5 @@
 module rec Fable.Python.Ast
 
-open System.Collections.Generic
 open Fable.Core
 
 // fsharplint:disable MemberNames,InterfaceNames
@@ -121,5 +120,5 @@ type IExports =
     /// Return a formatted dump of the tree in node.
     abstract dump : node: AST * annotate_fields: bool * include_attributes: bool -> string
 
-[<ImportDefault("ast")>]
+[<Import("ast")>]
 let ast: IExports = nativeOnly

src/Builtins.fs

@@ -120,5 +120,5 @@ type IExports =
         file: _OpenFile * mode: OpenTextMode * buffering: int * encoding: string * errors: string * newline: string ->
         TextIOWrapper
 
-[<ImportDefault("builtins")>]
+[<Import("builtins")>]
 let builtins: IExports = nativeOnly

src/Fable.Python.fsproj

@@ -3,18 +3,25 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Author>Dag Brattli</Author>
+    <Copyright>Dag Brattli</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Ast.fs" />
     <Compile Include="Builtins.fs" />
     <Compile Include="Json.fs" />
-    <Compile Include="Ast.fs" />
+    <Compile Include="Os.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../Fable/src/Fable.Core/Fable.Core.fsproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="pyproject.toml; *.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath=""/>
+  </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

src/Json.fs

@@ -8,5 +8,5 @@ type IExports =
     abstract dumps : obj: obj -> string
     abstract loads : string -> obj
 
-[<ImportDefault("json")>]
+[<Import("json")>]
 let json: IExports = nativeOnly

src/Os.fs

@@ -0,0 +1,14 @@
+module Fable.Python.Os
+
+open Fable.Core
+
+// fsharplint:disable MemberNames,InterfaceNames
+
+type IExports =
+    abstract getenv: key:string -> string option
+    abstract getenv: key:string * ``default``: string -> string
+    abstract putenv: key:string * value: string -> unit
+
+
+[<Import("os")>]
+let os : IExports = nativeOnly

src/pyproject.toml

@@ -12,6 +12,9 @@ fable-library = "^0.0.1"
 
 [tool.poetry.dev-dependencies]
 
+[tool.fable]
+package-dir = "fable-python/fable_python"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

test/TestJson.fs

@@ -3,11 +3,6 @@ module Fable.Python.Tests.Json
 open Util.Testing
 open Fable.Python.Json
 
-// type MyObject = {
-//     Foo: int
-//     Bar: string
-// }
-
 [<Fact>]
 let ``test works`` () =
     let result = true