#29 fix typing. by: Filip, Piotr

Author: caseneuve

cli/path.py

@@ -1,6 +1,5 @@
 import re
 import sys
-from typing import Tuple
 
 from collections import namedtuple
 from pprint import pprint
@@ -13,7 +12,7 @@
 app = typer.Typer()
 
 
-def setup(path: str, quiet: bool) -> Tuple[str, PAPath]:
+def setup(path: str, quiet: bool) -> PAPath:
     logger = get_logger(set_info=True)
     if quiet:
         logger.disabled = True
@@ -44,7 +43,7 @@ def get(
     if contents is None:
         sys.exit(1)
 
-    if raw or type(contents) == str:
+    if raw or isinstance(contents, str):
         {dict: pprint, str: print}[type(contents)](contents)
         sys.exit()
 

pythonanywhere/files.py

@@ -47,10 +47,10 @@ def __repr__(self):
     def _make_sharing_url(self, path):
         return urljoin(self.api.base_url.split("api")[0], path)
 
-    def _standarize_path(self, path):
+    @staticmethod
+    def _standarize_path(path):
         return path.replace("~", f"/home/{getpass.getuser()}") if path.startswith("~") else path
 
-
     @property
     def url(self):
         """Returns url to PythonAnywhere for `self.path`.  Does not
@@ -81,7 +81,7 @@ def contents(self):
 
         try:
             content = self.api.path_get(self.path)
-            return content if type(content) == dict else content.decode("utf-8")
+            return content if isinstance(content, dict) else content.decode("utf-8")
         except Exception as e:
             logger.warning(snakesay(str(e)))
             return None

pythonanywhere/files.pyi

@@ -1,14 +1,26 @@
-from typing import List, Optional, Union
+from typing import Optional, Union
+
+from typer import FileBinaryRead
+
+from pythonanywhere.api.files_api import Files
 
-from typing_extensions import Literal
 
 class PAPath:
+    path: str = ...
+    api: Files = ...
     def __init__(self, path: str) -> None: ...
     def __repr__(self) -> str: ...
+    def _make_sharing_url(self, path: str) -> str: ...
+    @staticmethod
+    def _standarize_path(path: str) -> str: ...
+    @property
+    def url(self) -> str: ...
+    @property
     def contents(self) -> Optional[Union[dict, str]]: ...
+    @property
     def tree(self) -> Optional[list]: ...
     def delete(self) -> bool: ...
-    def upload(self, content: bytes) -> bool: ...
+    def upload(self, content: FileBinaryRead) -> bool: ...
     def get_sharing_url(self) -> str: ...
     def share(self) -> str: ...
     def unshare(self) -> bool: ...