diff --git a/frappe/api.py b/frappe/api.py index 38c4598273..f99afb7a4f 100644 --- a/frappe/api.py +++ b/frappe/api.py @@ -8,8 +8,7 @@ import frappe.handler import frappe.client from frappe.utils.response import build_response from frappe import _ -from six.moves.urllib.parse import urlparse -from urllib import urlencode +from six.moves.urllib.parse import urlparse, urlencode def handle(): """ diff --git a/frappe/integrations/doctype/paypal_settings/paypal_settings.py b/frappe/integrations/doctype/paypal_settings/paypal_settings.py index b9d143b95f..36eff70fa1 100644 --- a/frappe/integrations/doctype/paypal_settings/paypal_settings.py +++ b/frappe/integrations/doctype/paypal_settings/paypal_settings.py @@ -60,9 +60,8 @@ import frappe import json from frappe import _ from frappe.utils import get_url, call_hook_method, cint -from urllib import urlencode +from six.moves.urllib.parse import urlencode from frappe.model.document import Document -import urllib from frappe.integrations.utils import create_request_log, make_post_request, create_payment_gateway class PayPalSettings(Document): @@ -237,9 +236,9 @@ def confirm_payment(token): redirect_url = "/integrations/payment-failed" if redirect_to: - redirect_url += '?' + urllib.urlencode({'redirect_to': redirect_to}) + redirect_url += '?' + urlencode({'redirect_to': redirect_to}) if redirect_message: - redirect_url += '&' + urllib.urlencode({'redirect_message': redirect_message}) + redirect_url += '&' + urlencode({'redirect_message': redirect_message}) # this is done so that functions called via hooks can update flags.redirect_to if redirect: diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py index c982424c96..9a79ef9bec 100644 --- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py +++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py @@ -55,7 +55,8 @@ For razorpay payment status is Authorized from __future__ import unicode_literals import frappe from frappe import _ -import urllib, json +import json +from six.moves.urllib.parse import urlencode from frappe.model.document import Document from frappe.utils import get_url, call_hook_method, cint from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway @@ -82,7 +83,7 @@ class RazorpaySettings(Document): frappe.throw(_("Please select another payment method. Razorpay does not support transactions in currency '{0}'").format(currency)) def get_payment_url(self, **kwargs): - return get_url("./integrations/razorpay_checkout?{0}".format(urllib.urlencode(kwargs))) + return get_url("./integrations/razorpay_checkout?{0}".format(urlencode(kwargs))) def create_request(self, data): self.data = frappe._dict(data) @@ -146,9 +147,9 @@ class RazorpaySettings(Document): redirect_url = 'payment-failed' if redirect_to: - redirect_url += '?' + urllib.urlencode({'redirect_to': redirect_to}) + redirect_url += '?' + urlencode({'redirect_to': redirect_to}) if redirect_message: - redirect_url += '&' + urllib.urlencode({'redirect_message': redirect_message}) + redirect_url += '&' + urlencode({'redirect_message': redirect_message}) return { "redirect_to": redirect_url, diff --git a/frappe/integrations/doctype/stripe_settings/stripe_settings.py b/frappe/integrations/doctype/stripe_settings/stripe_settings.py index 9966ff1049..d72b435667 100644 --- a/frappe/integrations/doctype/stripe_settings/stripe_settings.py +++ b/frappe/integrations/doctype/stripe_settings/stripe_settings.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe import _ -import urllib +from six.moves.urllib.parse import urlencode from frappe.utils import get_url, call_hook_method, cint from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway @@ -42,7 +42,7 @@ class StripeSettings(Document): frappe.throw(_("Please select another payment method. Stripe does not support transactions in currency '{0}'").format(currency)) def get_payment_url(self, **kwargs): - return get_url("./integrations/stripe_checkout?{0}".format(urllib.urlencode(kwargs))) + return get_url("./integrations/stripe_checkout?{0}".format(urlencode(kwargs))) def create_request(self, data): self.data = frappe._dict(data) @@ -105,9 +105,9 @@ class StripeSettings(Document): redirect_url = 'payment-failed' if redirect_to: - redirect_url += '?' + urllib.urlencode({'redirect_to': redirect_to}) + redirect_url += '?' + urlencode({'redirect_to': redirect_to}) if redirect_message: - redirect_url += '&' + urllib.urlencode({'redirect_message': redirect_message}) + redirect_url += '&' + urlencode({'redirect_message': redirect_message}) return { "redirect_to": redirect_url, diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py index 6889633c9b..7a5b616395 100644 --- a/frappe/integrations/oauth2.py +++ b/frappe/integrations/oauth2.py @@ -2,10 +2,8 @@ from __future__ import unicode_literals import frappe, json from frappe.oauth import OAuthWebRequestValidator, WebApplicationServer from oauthlib.oauth2 import FatalClientError, OAuth2Error -from urllib import urlencode -from six.moves.urllib.parse import quote from werkzeug import url_fix -from six.moves.urllib.parse import urlparse +from six.moves.urllib.parse import quote, urlencode, urlparse from frappe.integrations.doctype.oauth_provider_settings.oauth_provider_settings import get_oauth_settings from frappe import _ diff --git a/frappe/limits.py b/frappe/limits.py index 0f597e445f..a271b7c5d1 100755 --- a/frappe/limits.py +++ b/frappe/limits.py @@ -5,8 +5,8 @@ from frappe.utils import now_datetime, getdate, flt, cint, get_fullname from frappe.installer import update_site_config from frappe.utils.data import formatdate from frappe.utils.user import get_enabled_system_users, disable_users -import os, subprocess, urllib -from six.moves.urllib.parse import parse_qsl, urlsplit, urlunsplit +import os, subprocess +from six.moves.urllib.parse import parse_qsl, urlsplit, urlunsplit, urlencode class SiteExpiredError(frappe.ValidationError): http_status_code = 417 @@ -131,7 +131,7 @@ def get_upgrade_url(upgrade_url): 'country': frappe.db.get_value("System Settings", "System Settings", 'country') }) - query = urllib.urlencode(params, doseq=True) + query = urlencode(params, doseq=True) url = urlunsplit((parts.scheme, parts.netloc, parts.path, query, parts.fragment)) return url diff --git a/frappe/utils/verified_command.py b/frappe/utils/verified_command.py index 57170295f8..7ab493df23 100644 --- a/frappe/utils/verified_command.py +++ b/frappe/utils/verified_command.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import hmac -import urllib +from six.moves.urllib.parse import urlencode from frappe import _ import frappe @@ -14,7 +14,7 @@ def get_signed_params(params): :param params: String or dict of parameters.""" if not isinstance(params, basestring): - params = urllib.urlencode(params) + params = urlencode(params) signature = hmac.new(params) signature.update(get_secret()) @@ -49,7 +49,7 @@ def get_url(cmd, params, nonce=None, secret=None): nonce = params signature = get_signature(params, nonce, secret) params['signature'] = signature - return frappe.utils.get_url("".join(['api/method/', cmd, '?', urllib.urlencode(params)])) + return frappe.utils.get_url("".join(['api/method/', cmd, '?', urlencode(params)])) def get_signature(params, nonce, secret=None): params = "".join((frappe.utils.cstr(p) for p in params.values())) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 6abe0d0d9e..182d385c5f 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -11,7 +11,7 @@ from frappe.website.utils import get_comment_list from frappe.custom.doctype.customize_form.customize_form import docfield_properties from frappe.utils.file_manager import get_max_file_size from frappe.modules.utils import export_module_json, get_doc_module -from urllib import urlencode +from six.moves.urllib.parse import urlencode from frappe.integrations.utils import get_payment_gateway_controller from six import iteritems