Merge pull request 'Use path/filepath instead of path' (#391) from windows-paths into master

Reviewed-on: #391
2021-09-30 23:02:05 +00:00 · 2021-09-30 23:02:05 +00:00 · 9ccaef78c5
parent eefc39272a 99ae12519a
commit 9ccaef78c5
3 changed files with 9 additions and 43110 deletions
--- a/functionality/filesharing/filesharing_functionality.go
+++ b/functionality/filesharing/filesharing_functionality.go
@ -2,20 +2,19 @@ package filesharing

 import (
 	"crypto/rand"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"path"
-	"strconv"
-
 	"cwtch.im/cwtch/model"
 	"cwtch.im/cwtch/model/attr"
 	"cwtch.im/cwtch/peer"
 	"cwtch.im/cwtch/protocol/files"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"git.openprivacy.ca/openprivacy/log"
+	"io"
+	"math"
+	path "path/filepath"
+	"strconv"
 )

 // Functionality groups some common UI triggered functions for contacts...
--- a/protocol/files/filesharing_subsystem.go
+++ b/protocol/files/filesharing_subsystem.go
@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"path"
+	path "path/filepath"
 	"strconv"
 	"strings"
 	"sync"
--- a/testing/monero/tordir/tor/data-dir-745049642/cached-microdesc-consensus
+++ b/testing/monero/tordir/tor/data-dir-745049642/cached-microdesc-consensus