Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build(deps): update tweepy 3.10.0 -> 4.14.0

Browse Source
This commit is contained in:
David Arnold 2023-07-23 22:15:02 -05:00
parent e6abe1b77f
commit b740cdfc00
No known key found for this signature in database
GPG Key ID: 0318D822BAC965CC
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/crm/doctype/twitter_settings/twitter_settings.py
View File

@ -10,7 +10,6 @@ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import get_url_to_form from frappe.utils import get_url_to_form
from frappe.utils.file_manager import get_file_path from frappe.utils.file_manager import get_file_path
from tweepy.error import TweepError
class TwitterSettings(Document): class TwitterSettings(Document):
@ -21,20 +20,22 @@ class TwitterSettings(Document):
frappe.utils.get_url() frappe.utils.get_url()
) )
) )
auth = tweepy.OAuthHandler( auth = tweepy.OAuth1UserHandler(
self.consumer_key, self.get_password(fieldname="consumer_secret"), callback_url self.consumer_key, self.get_password(fieldname="consumer_secret"), callback_url
) )
try: try:
redirect_url = auth.get_authorization_url() redirect_url = auth.get_authorization_url()
return redirect_url return redirect_url
except tweepy.TweepError as e: except (tweepy.TweepyException, tweepy.HTTPException) as e:
frappe.msgprint(_("Error! Failed to get request token.")) frappe.msgprint(_("Error! Failed to get request token."))
frappe.throw( frappe.throw(
_("Invalid {0} or {1}").format(frappe.bold("Consumer Key"), frappe.bold("Consumer Secret Key")) _("Invalid {0} or {1}").format(frappe.bold("Consumer Key"), frappe.bold("Consumer Secret Key"))
) )
def get_access_token(self, oauth_token, oauth_verifier): def get_access_token(self, oauth_token, oauth_verifier):
auth = tweepy.OAuthHandler(self.consumer_key, self.get_password(fieldname="consumer_secret")) auth = tweepy.OAuth1UserHandler(
self.consumer_key, self.get_password(fieldname="consumer_secret")
)
auth.request_token = {"oauth_token": oauth_token, "oauth_token_secret": oauth_verifier} auth.request_token = {"oauth_token": oauth_token, "oauth_token_secret": oauth_verifier}
try: try:
@ -59,13 +60,15 @@ class TwitterSettings(Document):
frappe.local.response["type"] = "redirect" frappe.local.response["type"] = "redirect"
frappe.local.response["location"] = get_url_to_form("Twitter Settings", "Twitter Settings") frappe.local.response["location"] = get_url_to_form("Twitter Settings", "Twitter Settings")
except TweepError as e: except (tweepy.TweepyException, tweepy.HTTPException) as e:
frappe.msgprint(_("Error! Failed to get access token.")) frappe.msgprint(_("Error! Failed to get access token."))
frappe.throw(_("Invalid Consumer Key or Consumer Secret Key")) frappe.throw(_("Invalid Consumer Key or Consumer Secret Key"))
def get_api(self): def get_api(self):
# authentication of consumer key and secret # authentication of consumer key and secret
auth = tweepy.OAuthHandler(self.consumer_key, self.get_password(fieldname="consumer_secret")) auth = tweepy.OAuth1UserHandler(
self.consumer_key, self.get_password(fieldname="consumer_secret")
)
# authentication of access token and secret # authentication of access token and secret
auth.set_access_token(self.access_token, self.access_token_secret) auth.set_access_token(self.access_token, self.access_token_secret)
@ -96,21 +99,21 @@ class TwitterSettings(Document):
return response return response
except TweepError as e: except (tweepy.TweepyException, tweepy.HTTPException) as e:
self.api_error(e) self.api_error(e)
def delete_tweet(self, tweet_id): def delete_tweet(self, tweet_id):
api = self.get_api() api = self.get_api()
try: try:
api.destroy_status(tweet_id) api.destroy_status(tweet_id)
except TweepError as e: except (tweepy.TweepyException, tweepy.HTTPException) as e:
self.api_error(e) self.api_error(e)
def get_tweet(self, tweet_id): def get_tweet(self, tweet_id):
api = self.get_api() api = self.get_api()
try: try:
response = api.get_status(tweet_id, trim_user=True, include_entities=True) response = api.get_status(tweet_id, trim_user=True, include_entities=True)
except TweepError as e: except (tweepy.TweepyException, tweepy.HTTPException) as e:
self.api_error(e) self.api_error(e)
return response._json return response._json

2
pyproject.toml
View File

@ -20,7 +20,7 @@ dependencies = [
"googlemaps", "googlemaps",
"plaid-python~=7.2.1", "plaid-python~=7.2.1",
"python-youtube~=0.8.0", "python-youtube~=0.8.0",
"tweepy~=3.10.0", "tweepy~=4.14.0",
# Not used directly - required by PyQRCode for PNG generation # Not used directly - required by PyQRCode for PNG generation
"pypng~=0.20220715.0", "pypng~=0.20220715.0",