feat: remove deprecated apis

Author: aisk

leancloud/engine/__init__.py

@@ -2,7 +2,6 @@
 
 import sys
 import json
-import warnings
 
 from werkzeug.wrappers import Request
 from werkzeug.wrappers import Response
@@ -71,11 +70,6 @@ def __call__(self, environ, start_response):
             return self.cloud_app(environ, start_response)
         return self.origin_app(environ, start_response)
 
-    @property
-    def current_user(self):
-        warnings.warn('Engine.current_user is deprecated, please use Engine.current.user instead', leancloud.LeanCloudWarning)
-        return user
-
     def wrap(self, wsgi_app):
         if leanengine.root_engine:
             raise RuntimeError("It's forbidden that overwriting wsgi_func.")

leancloud/engine/cloudfunc.py

@@ -10,7 +10,6 @@
 import hashlib
 import uuid
 import logging
-import warnings
 import threading
 
 import requests
@@ -33,7 +32,7 @@
 class File(object):
     _class_name = '_File'  # walks like a leancloud.Object
 
-    def __init__(self, name='', data=None, mime_type=None, type_=None):
+    def __init__(self, name='', data=None, mime_type=None):
         self._name = name
         self.id = None
         self._url = None
@@ -45,10 +44,6 @@ def __init__(self, name='', data=None, mime_type=None, type_=None):
         if self.current_user and self.current_user != None:  # NOQA: self.current_user may be a thread_local object
             self._metadata['owner'] = self.current_user.id
 
-        if type_ is not None:
-            warnings.warn(LeanCloudWarning('optional param `type_` is deprecated, please use `mime_type` instead'))
-            mime_type = type_
-
         pattern = re.compile('\.([^.]*)$')
         extension = pattern.findall(name)
         if extension:
@@ -92,11 +87,7 @@ def query(cls):
         return leancloud.Query(cls)
 
     @classmethod
-    def create_with_url(cls, name, url, meta_data=None, mime_type=None, type_=None):
-        if type_ is not None:
-            warnings.warn('optional param `type_` is deprecated, please use `mime_type` instead')
-            mime_type = type_
-
+    def create_with_url(cls, name, url, meta_data=None, mime_type=None):
         f = File(name, None, mime_type)
         if meta_data:
             f._metadata.update(meta_data)

leancloud/file_.py

@@ -7,7 +7,6 @@
 import time
 import copy
 import json
-import warnings
 
 import iso8601
 from werkzeug import LocalProxy
@@ -83,20 +82,10 @@ def __init__(self, **attrs):
         self._attributes = {}
         self.created_at = None
         self.updated_at = None
-        self._fetch_when_save = False
 
         for k, v in iteritems(attrs):
             self.set(k, v)
 
-    @property
-    def fetch_when_save(self):
-        return self._fetch_when_save
-
-    @fetch_when_save.setter
-    def fetch_when_save(self, value):
-        warnings.warn('leancloud.Object.fetch_when_save is deprecated, please use leancloud.Object.save with param fetch_when_save instead.', leancloud.errors.LeanCloudWarning);
-        self._fetch_when_save = value
-
     @classmethod
     def extend(cls, name):
         """
@@ -171,11 +160,6 @@ def destroy_all(cls, objs):
         ids = ','.join(ids)
         client.delete('/classes/{0}/{1}'.format(objs[0]._class_name, ids))
 
-    @property
-    def attributes(self):
-        warnings.warn('leancloud.Object.attributes should not be used any more, please use get or set instead', leancloud.errors.LeanCloudWarning)
-        return self._attributes
-
     def dump(self):
         obj = self._dump()
         obj.pop('__type')
@@ -227,8 +211,6 @@ def save(self, where=None, fetch_when_save=None):
             self._deep_save(unsaved_children, unsaved_files, exclude=self._attributes)
 
         data = self._dump_save()
-        if fetch_when_save is None:
-            fetch_when_save = self.fetch_when_save
         fetch_when_save = 'true' if fetch_when_save else 'false'
 
         if self.is_new():

leancloud/object_.py

@@ -5,7 +5,6 @@
 from __future__ import print_function
 
 import json
-import warnings
 
 import leancloud
 from leancloud import client
@@ -91,10 +90,6 @@ def __init__(self, query_class):
         self._order = []
         self._select = []
 
-    def __call__(self):
-        warnings.warn('leancloud.Relation.query now is a property, please don\'t call it as a function', LeanCloudWarning)
-        return self
-
     @classmethod
     def or_(cls, *queries):
         """
@@ -399,10 +394,6 @@ def exists(self, key):
         self._add_condition(key, '$exists', True)
         return self
 
-    def does_not_exists(self, key):
-        warnings.warn('the query does_not_exists is deprecated, please use does_not_exist instead', LeanCloudWarning)
-        return self.does_not_exist(key)
-
     def does_not_exist(self, key):
         """
         增加查询条件，限制查询结果对象不包含指定字段
@@ -463,10 +454,6 @@ def does_not_match_query(self, key, query):
         self._add_condition(key, '$notInQuery', dumped)
         return self
 
-    def matched_key_in_query(self, key, query_key, query):
-        warnings.warn('the query matched_key_in_query is deprecated, please use matches_key_in_query', LeanCloudWarning)
-        return self.matches_key_in_query(key, query_key, query)
-
     def matches_key_in_query(self, key, query_key, query):
         """
         增加查询条件，限制查询结果对象指定字段的值，与另外一个查询对象的返回结果指定的值相同。

leancloud/query.py

@@ -507,7 +507,7 @@ def test_current_user(): # type: () -> None
 
     @engine.define
     def current_user():
-        user = engine.current_user
+        user = engine.current.user
         TestCurrentUser = leancloud.Object.extend('TestCurrentUser')
         o = TestCurrentUser()
         o.set('user', user)
@@ -532,7 +532,7 @@ def current_user():
 
     @engine.before_save('Xxx')
     def before_xxx_save(xxx):
-        assert engine.current_user.get('username') == saved_user.get('username')
+        assert engine.current.user.get('username') == saved_user.get('username')
 
     response = requests.post(url + '/__engine/1/functions/Xxx/beforeSave', headers={
         'x-avoscloud-application-id': TEST_APP_ID,

tests/test_engine.py

@@ -37,12 +37,10 @@ def test_basic():  # type: () -> None
         s1.write('blah blah blah')
     else:
         s1 = s
-    f1 = File('Blah', s, mime_type='text/plain')
-    f2 = File('Blah', s1, type_='text/plain')
-    for f in (f1, f2):
-        assert f.name == 'Blah'
-        assert f._metadata['size'] == 14
-        assert f.size == 14
+    f = File('Blah', s, mime_type='text/plain')
+    assert f.name == 'Blah'
+    assert f._metadata['size'] == 14
+    assert f.size == 14
 
 
 def test_create_with_url():  # type: () -> None

tests/test_file.py

@@ -311,7 +311,7 @@ def test_contains_all(): # type: () -> None
 
 @with_setup(make_setup_func())
 def test_exist_and_does_not_exists(): # type: () -> None
-    assert Query(GameScore).does_not_exists('oops').find()
+    assert Query(GameScore).does_not_exist('oops').find()
     result = Query(GameScore).exists('playerName').find()
     assert len(result) == 10
 

tests/test_query.py

@@ -51,7 +51,7 @@ def test_query_relation(): # type: () -> None
 
     album = leancloud.Query('Album').get(album.id)
     relation = album.relation('band')
-    bands = relation.query().find()
+    bands = relation.query.find()
     assert band1.id in [x.id for x in bands]
     assert band2.id in [x.id for x in bands]