Merge pull request #18 from ShingenPizza/style_fixes

Style and warning fixes.

Author: Katistic

examples/async/Get avatar.py

@@ -8,7 +8,7 @@ async def main():
 
     # Get avatar via id
     a = await client.fetch_avatar("avtr_fa5303c6-78d1-451c-a678-faf3eadb5c50")
-    author = await a.author() # Get author of the avatar
+    author = await a.author()  # Get author of the avatar
     print("Avatar '"+a.name+"' was made by "+author.displayName)
     ## This should print "Avatar 'Etoigne' was made by Katfish"
 

examples/async/WebSocket Client.py

@@ -16,7 +16,7 @@
 class AClient(AWSSClient):
     async def on_friend_location(self, friend, world, location, instance):
         print("{} is now in {}.".format(friend.displayName,
-                                        "a private world" if location == None else world.name))
+                                        "a private world" if location is None else world.name))
 
     async def on_friend_offline(self, friend):
         print("{} went offline.".format(friend.displayName))
@@ -73,7 +73,7 @@ def __init__(self):
 @client.event
 async def on_friend_location(friend, world, location, instance):
     print("{} is now in {}.".format(friend.displayName,
-                                    "a private world" if location == None else world.name))
+                                    "a private world" if location is None else world.name))
 
 
 @client.event

examples/sync/Get avatar.py

@@ -7,7 +7,7 @@ def main():
 
     # Get avatar via id
     a = client.fetch_avatar("avtr_fa5303c6-78d1-451c-a678-faf3eadb5c50")
-    author = a.author() # Get author of the avatar
+    author = a.author()  # Get author of the avatar
     print("Avatar '"+a.name+"' was made by "+author.displayName)
     ## This should print "Avatar 'Etoigne' was made by Katfish"
 

examples/sync/WebSocket Client.py

@@ -16,7 +16,7 @@
 class Client(WSSClient):
     def on_friend_location(self, friend, world, location, instance):
         print("{} is now in {}.".format(friend.displayName,
-                                        "a private world" if location == None else world.name))
+                                        "a private world" if location is None else world.name))
 
     def on_friend_offline(self, friend):
         print("{} went offline.".format(friend.displayName))
@@ -73,7 +73,7 @@ def __init__(self):
 @client.event
 def on_friend_location(friend, world, location, instance):
     print("{} is now in {}.".format(friend.displayName,
-                                    "a private world" if location == None else world.name))
+                                    "a private world" if location is None else world.name))
 
 
 @client.event

setup.py

@@ -1,18 +1,15 @@
 from setuptools import setup
 import re
 
-requirements = []
 with open('requirements.txt') as f:
     requirements = f.read().splitlines()
 
-version=''
 with open("vrcpy/__init__.py") as f:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', f.read(), re.MULTILINE).group(1)
 
 if not version:
     raise RuntimeError('Version is not set')
 
-readme = ''
 with open("README.md") as f:
     readme = f.read()
 
@@ -24,7 +21,8 @@
     ]
 }
 
-setup(name="vrcpy",
+setup(
+    name="vrcpy",
     author="Katistic",
     url="https://github.com/VRChatAPI/VRChatPython",
     project_urls={

vrcpy/aobjects.py

@@ -109,7 +109,7 @@ async def update_info(self, email=None, status=None,
                   "bio": bio, "bioLinks": bioLinks}
 
         for p in params:
-            if params[p] == None:
+            if params[p] is None:
                 params[p] = getattr(self, p)
 
         resp = await self.client.api.call("/users/"+self.id, "PUT", params=params)
@@ -128,8 +128,8 @@ async def avatars(self, releaseStatus=types.ReleaseStatus.All):
 
         return avatars
 
-    async def fetch_favorites(self, t):
-        resp = await self.client.api.call("/favorites", params={"type": t})
+    async def fetch_favorites(self, t, n: int = 100):
+        resp = await self.client.api.call("/favorites", params={"type": t, "n": n})
 
         f = []
         for favorite in resp["data"]:
@@ -145,7 +145,7 @@ async def favorite(self):
         raise AttributeError("'CurrentUser' object has no attribute 'favorite'")
 
     async def remove_favorite(self, id):
-        resp = await self.client.api.call("/favorites/"+id, "DELETE")
+        await self.client.api.call("/favorites/"+id, "DELETE")
 
     async def fetch_favorite(self, id):
         resp = await self.client.api.call("/favorites/"+id)
@@ -178,7 +178,7 @@ async def __cinit__(self):
             self.homeLocation = None
 
         # Wait for all cacheTasks
-        if not self.homeLocation == None and self.client.caching:
+        if self.homeLocation is not None and self.client.caching:
             await self.homeLocation.cacheTask
 
 

vrcpy/client.py

@@ -9,7 +9,6 @@
 import urllib
 import base64
 import time
-import json
 
 
 class Client:
@@ -26,7 +25,7 @@ def _log(self, log):  # TODO: Finish logging, also, dunno how I'm gonna do this
         dt = datetime.now().strftime("%d/%m - %H:%M:%S")
 
         if self.log_to_console:
-            print("[%s] %s" % dt, log)
+            print("[%s] %s" % (dt, log))
 
     # User calls
 
@@ -88,7 +87,7 @@ def fetch_friends(self, offline=False, n=0, offset=0):
 
         while True:
             newn = 100
-            if not n == 0 and n - len(friends) < 100:
+            if n and n - len(friends) < 100:
                 newn = n - len(friends)
 
             last_count = 0
@@ -261,7 +260,7 @@ def logout(self):
         Returns void
         '''
 
-        resp = self.api.call("/logout", "PUT")
+        self.api.call("/logout", "PUT")
 
         self.api.new_session()
         self.loggedIn = False
@@ -351,7 +350,7 @@ def verify2fa(self, code):
         if self.loggedIn:
             raise AlreadyLoggedInError("Client is already logged in")
 
-        resp = self.api.call(
+        self.api.call(
             "/auth/twofactorauth/{}/verify".format("totp" if len(code) == 6 else "otp"),
             "POST", json={"code": code}
         )
@@ -369,6 +368,7 @@ def __init__(self, verify=True, caching=True):
         self.caching = caching
 
         self.needsVerification = False
+        self.log_to_console = False
 
 
 class AClient(Client):
@@ -387,7 +387,6 @@ async def fetch_me(self):
         Returns CurrentUser object
         '''
 
-        self.cacheFull = False
         resp = await self.api.call("/auth/user")
 
         self.me = aobjects.CurrentUser(self, resp["data"])
@@ -440,7 +439,7 @@ async def fetch_friends(self, offline=False, n=0, offset=0):
 
         while True:
             newn = 100
-            if not n == 0 and n - len(friends) < 100:
+            if n and n - len(friends) < 100:
                 newn = n - len(friends)
 
             last_count = 0
@@ -613,7 +612,7 @@ async def logout(self):
         Returns void
         '''
 
-        resp = await self.api.call("/logout", "PUT")
+        await self.api.call("/logout", "PUT")
 
         await self.api.closeSession()
         await asyncio.sleep(0)

vrcpy/objects.py

@@ -1,15 +1,17 @@
-from vrcpy._hardtyping import *
-
-from vrcpy.errors import IntegretyError, GeneralError
-from vrcpy import types
 
 import asyncio
 
+import vrcpy
+from vrcpy import types
+from vrcpy.errors import IntegretyError, GeneralError
+from vrcpy._hardtyping import *
+
 
 class BaseObject:
     objType = "Base"
 
     def __init__(self, client):
+        self.id = None
         self.unique = []  # Keys that identify this object
         self.only = []  # List of all keys in this object, if used
         self.types = {}  # Dictionary of what keys have special types
@@ -40,7 +42,7 @@ def _assign(self, obj):
             else:
                 self.__cinit__()
         elif hasattr(self, "__cinit__"):
-            if str(type(self.client)) == "<class 'vrcpy.client.AClient'>":
+            if isinstance(self.client, vrcpy.client.AClient):
                 async def di1(self):
                     async def di2(self):
                         raise AttributeError(self.objType + " object has no attribute 'do_init'")
@@ -63,18 +65,18 @@ def di2(self):
         self._dict = obj
 
     def _objectIntegrety(self, obj):
-        if self.only == []:
+        if not self.only:
             for key in self.unique:
-                if not key in obj:
+                if key not in obj:
                     raise IntegretyError("Object does not have unique key ("+key+") for "+self.objType +
                                          " (Class definition may be outdated, please make an issue on github)")
         else:
             for key in obj:
-                if not key in self.only:
+                if key not in self.only:
                     raise IntegretyError("Object has key not found in "+self.objType +
                                          " (Class definition may be outdated, please make an issue on github)")
             for key in self.only:
-                if not key in obj:
+                if key not in obj:
                     raise IntegretyError("Object does not have requred key ("+key+") for "+self.objType +
                                          " (Class definition may be outdated, please make an issue on github)")
 
@@ -112,6 +114,7 @@ def select(self):
 
     def __init__(self, client, obj):
         super().__init__(client)
+        self.authorId = None
         self.unique += [
             "authorId",
             "authorName",
@@ -193,7 +196,7 @@ def __init__(self, client, obj=None):
             "instanceId": Location
         })
 
-        if not obj == None:
+        if obj is not None:
             self._assign(obj)
         if not hasattr(self, "bio"):
             self.bio = ""
@@ -208,7 +211,7 @@ def __init__(self, client, obj=None):
             "allowAvatarCopying"
         ]
 
-        if not obj == None:
+        if obj is not None:
             self._assign(obj)
 
 
@@ -276,7 +279,7 @@ def update_info(self, email=None, status=None,
                   "bio": bio, "bioLinks": bioLinks}
 
         for p in params:
-            if params[p] == None:
+            if params[p] is None:
                 params[p] = getattr(self, p)
 
         resp = self.client.api.call("/users/"+self.id, "PUT", params=params)
@@ -424,6 +427,7 @@ def favorite(self):
 
     def __init__(self, client, obj=None):
         super().__init__(client)
+        self.authorId = None
         self.unique += [
             "visits",
             "occupants",
@@ -434,7 +438,7 @@ def __init__(self, client, obj=None):
             "unityPackages": UnityPackage
         })
 
-        if not obj == None:
+        if obj is not None:
             self._assign(obj)
 
 
@@ -478,7 +482,7 @@ class Location:
     objType = "Location"
 
     def __init__(self, client, location):
-        if not type(location) == str:
+        if not isinstance(location, str):
             raise TypeError("Expected string, got "+str(type(location)))
 
         self.nonce = None
@@ -501,10 +505,10 @@ def __init__(self, client, location):
                     self.type, self.userId = t[:-1].split("(")
                     self.nonce = nonce.split("(")[1][:-1]
                 elif location.count("~") == 1:
-                    self.name, self.type = location.split("~") # Needs testing, https://github.com/vrchatapi/VRChatPython/issues/17
+                    self.name, self.type = location.split("~")  # Needs testing, https://github.com/vrchatapi/VRChatPython/issues/17
             else:
                 self.name = location
-        except Exception as e: # https://github.com/vrchatapi/VRChatPython/issues/17
+        except Exception as e:  # https://github.com/vrchatapi/VRChatPython/issues/17
             raise GeneralError("Exception occured while trying to parse location string ({})! Please open an issue on github! {}".format(originalLocation, e))
 
 
@@ -538,6 +542,9 @@ def join(self):
 
     def __init__(self, client, obj):
         super().__init__(client)
+        self.worldId = None
+        self.location = None
+        self.shortName = None
         self.unique += [
             "n_users",
             "instanceId",
@@ -619,6 +626,8 @@ def __cinit__(self):
 
     def __init__(self, client, obj):
         super().__init__(client)
+        self.type = None
+        self.favoriteId = None
 
         self.unique += [
             "id",