From 6cdd04b0ced721d9f7116cd40b99cf8c27afa952 Mon Sep 17 00:00:00 2001 From: Martin Levy Date: Mon, 12 Dec 2016 16:55:41 -0800 Subject: [PATCH] plenty of pylint edits - not that it changes anyway useful --- CloudFlare/api_v4.py | 206 ++++++++++++++++++++------------------- CloudFlare/cloudflare.py | 114 +++++++++++----------- CloudFlare/exceptions.py | 6 +- cli4/cli4.py | 21 ++-- 4 files changed, 178 insertions(+), 169 deletions(-) diff --git a/CloudFlare/api_v4.py b/CloudFlare/api_v4.py index 6799a2f..d2b52ab 100644 --- a/CloudFlare/api_v4.py +++ b/CloudFlare/api_v4.py @@ -3,240 +3,242 @@ def api_v4(self): """ API core commands for Cloudflare API""" + base = self._base + # The API commands for /user/ setattr(self, "user", - self._add_with_auth(self._base, "user")) + self._add_with_auth(base, "user")) user = getattr(self, "user") setattr(user, "billing", - self._add_unused(self._base, "user/billing")) + self._add_unused(base, "user/billing")) user_billing = getattr(user, "billing") setattr(user_billing, "history", - self._add_with_auth(self._base, "user/billing/history")) + self._add_with_auth(base, "user/billing/history")) setattr(user_billing, "profile", - self._add_with_auth(self._base, "user/billing/profile")) + self._add_with_auth(base, "user/billing/profile")) setattr(user_billing, "subscriptions", - self._add_unused(self._base, "user/billing/subscriptions")) + self._add_unused(base, "user/billing/subscriptions")) user_billing_subscriptions = getattr(user_billing, "subscriptions") setattr(user_billing_subscriptions, "apps", - self._add_with_auth(self._base, "user/billing/subscriptions/apps")) + self._add_with_auth(base, "user/billing/subscriptions/apps")) setattr(user_billing_subscriptions, "zones", - self._add_with_auth(self._base, "user/billing/subscriptions/zones")) + self._add_with_auth(base, "user/billing/subscriptions/zones")) setattr(user, "firewall", - self._add_unused(self._base, "user/firewall")) + self._add_unused(base, "user/firewall")) user_firewall = getattr(user, "firewall") setattr(user_firewall, "access_rules", - self._add_unused(self._base, "user/firewall/access_rules")) + self._add_unused(base, "user/firewall/access_rules")) user_firewall_access_rules = getattr(user_firewall, "access_rules") setattr(user_firewall_access_rules, "rules", - self._add_with_auth(self._base, "user/firewall/access_rules/rules")) + self._add_with_auth(base, "user/firewall/access_rules/rules")) setattr(user, "organizations", - self._add_with_auth(self._base, "user/organizations")) + self._add_with_auth(base, "user/organizations")) setattr(user, "invites", - self._add_with_auth(self._base, "user/invites")) + self._add_with_auth(base, "user/invites")) setattr(user, "virtual_dns", - self._add_with_auth(self._base, "user/virtual_dns")) + self._add_with_auth(base, "user/virtual_dns")) # The API commands for /zones/ setattr(self, "zones", - self._add_with_auth(self._base, "zones")) + self._add_with_auth(base, "zones")) zones = getattr(self, "zones") setattr(zones, "activation_check", - self._add_with_auth(self._base, "zones", "activation_check")) + self._add_with_auth(base, "zones", "activation_check")) setattr(zones, "available_plans", - self._add_with_auth(self._base, "zones", "available_plans")) + self._add_with_auth(base, "zones", "available_plans")) setattr(zones, "available_rate_plans", - self._add_with_auth(self._base, "zones", "available_rate_plans")) + self._add_with_auth(base, "zones", "available_rate_plans")) setattr(zones, "custom_certificates", - self._add_with_auth(self._base, "zones", "custom_certificates")) + self._add_with_auth(base, "zones", "custom_certificates")) zones_custom_certificates = getattr(zones, "custom_certificates") setattr(zones_custom_certificates, "prioritize", - self._add_with_auth(self._base, "zones", "custom_certificates/prioritize")) + self._add_with_auth(base, "zones", "custom_certificates/prioritize")) setattr(zones, "custom_pages", - self._add_with_auth(self._base, "zones", "custom_pages")) + self._add_with_auth(base, "zones", "custom_pages")) setattr(zones, "dns_records", - self._add_with_auth(self._base, "zones", "dns_records")) + self._add_with_auth(base, "zones", "dns_records")) setattr(zones, "keyless_certificates", - self._add_with_auth(self._base, "zones", "keyless_certificates")) + self._add_with_auth(base, "zones", "keyless_certificates")) setattr(zones, "pagerules", - self._add_with_auth(self._base, "zones", "pagerules")) + self._add_with_auth(base, "zones", "pagerules")) setattr(zones, "purge_cache", - self._add_with_auth(self._base, "zones", "purge_cache")) + self._add_with_auth(base, "zones", "purge_cache")) setattr(zones, "railguns", - self._add_with_auth(self._base, "zones", "railguns")) + self._add_with_auth(base, "zones", "railguns")) zones_railguns = getattr(zones, "railguns") setattr(zones_railguns, "diagnose", - self._add_with_auth(self._base, "zones", "railguns", "diagnose")) + self._add_with_auth(base, "zones", "railguns", "diagnose")) setattr(zones, "settings", - self._add_with_auth(self._base, "zones", "settings")) + self._add_with_auth(base, "zones", "settings")) zones_settings = getattr(zones, "settings") setattr(zones_settings, "advanced_ddos", - self._add_with_auth(self._base, "zones", "settings/advanced_ddos")) + self._add_with_auth(base, "zones", "settings/advanced_ddos")) setattr(zones_settings, "always_online", - self._add_with_auth(self._base, "zones", "settings/always_online")) + self._add_with_auth(base, "zones", "settings/always_online")) setattr(zones_settings, "browser_cache_ttl", - self._add_with_auth(self._base, "zones", "settings/browser_cache_ttl")) + self._add_with_auth(base, "zones", "settings/browser_cache_ttl")) setattr(zones_settings, "browser_check", - self._add_with_auth(self._base, "zones", "settings/browser_check")) + self._add_with_auth(base, "zones", "settings/browser_check")) setattr(zones_settings, "cache_level", - self._add_with_auth(self._base, "zones", "settings/cache_level")) + self._add_with_auth(base, "zones", "settings/cache_level")) setattr(zones_settings, "challenge_ttl", - self._add_with_auth(self._base, "zones", "settings/challenge_ttl")) + self._add_with_auth(base, "zones", "settings/challenge_ttl")) setattr(zones_settings, "development_mode", - self._add_with_auth(self._base, "zones", "settings/development_mode")) + self._add_with_auth(base, "zones", "settings/development_mode")) setattr(zones_settings, "email_obfuscation", - self._add_with_auth(self._base, "zones", "settings/email_obfuscation")) + self._add_with_auth(base, "zones", "settings/email_obfuscation")) setattr(zones_settings, "hotlink_protection", - self._add_with_auth(self._base, "zones", "settings/hotlink_protection")) + self._add_with_auth(base, "zones", "settings/hotlink_protection")) setattr(zones_settings, "ip_geolocation", - self._add_with_auth(self._base, "zones", "settings/ip_geolocation")) + self._add_with_auth(base, "zones", "settings/ip_geolocation")) setattr(zones_settings, "ipv6", - self._add_with_auth(self._base, "zones", "settings/ipv6")) + self._add_with_auth(base, "zones", "settings/ipv6")) setattr(zones_settings, "minify", - self._add_with_auth(self._base, "zones", "settings/minify")) + self._add_with_auth(base, "zones", "settings/minify")) setattr(zones_settings, "mirage", - self._add_with_auth(self._base, "zones", "settings/mirage")) + self._add_with_auth(base, "zones", "settings/mirage")) setattr(zones_settings, "mobile_redirect", - self._add_with_auth(self._base, "zones", "settings/mobile_redirect")) + self._add_with_auth(base, "zones", "settings/mobile_redirect")) setattr(zones_settings, "origin_error_page_pass_thru", - self._add_with_auth(self._base, "zones", "settings/origin_error_page_pass_thru")) + self._add_with_auth(base, "zones", "settings/origin_error_page_pass_thru")) setattr(zones_settings, "polish", - self._add_with_auth(self._base, "zones", "settings/polish")) + self._add_with_auth(base, "zones", "settings/polish")) setattr(zones_settings, "prefetch_preload", - self._add_with_auth(self._base, "zones", "settings/prefetch_preload")) + self._add_with_auth(base, "zones", "settings/prefetch_preload")) setattr(zones_settings, "response_buffering", - self._add_with_auth(self._base, "zones", "settings/response_buffering")) + self._add_with_auth(base, "zones", "settings/response_buffering")) setattr(zones_settings, "rocket_loader", - self._add_with_auth(self._base, "zones", "settings/rocket_loader")) + self._add_with_auth(base, "zones", "settings/rocket_loader")) setattr(zones_settings, "security_header", - self._add_with_auth(self._base, "zones", "settings/security_header")) + self._add_with_auth(base, "zones", "settings/security_header")) setattr(zones_settings, "security_level", - self._add_with_auth(self._base, "zones", "settings/security_level")) + self._add_with_auth(base, "zones", "settings/security_level")) setattr(zones_settings, "server_side_exclude", - self._add_with_auth(self._base, "zones", "settings/server_side_exclude")) + self._add_with_auth(base, "zones", "settings/server_side_exclude")) setattr(zones_settings, "sort_query_string_for_cache", - self._add_with_auth(self._base, "zones", "settings/sort_query_string_for_cache")) + self._add_with_auth(base, "zones", "settings/sort_query_string_for_cache")) setattr(zones_settings, "ssl", - self._add_with_auth(self._base, "zones", "settings/ssl")) + self._add_with_auth(base, "zones", "settings/ssl")) setattr(zones_settings, "tls_client_auth", - self._add_with_auth(self._base, "zones", "settings/tls_client_auth")) + self._add_with_auth(base, "zones", "settings/tls_client_auth")) setattr(zones_settings, "true_client_ip_header", - self._add_with_auth(self._base, "zones", "settings/true_client_ip_header")) + self._add_with_auth(base, "zones", "settings/true_client_ip_header")) setattr(zones_settings, "tls_1_2_only", - self._add_with_auth(self._base, "zones", "settings/tls_1_2_only")) + self._add_with_auth(base, "zones", "settings/tls_1_2_only")) setattr(zones_settings, "tls_1_3", - self._add_with_auth(self._base, "zones", "settings/tls_1_3")) + self._add_with_auth(base, "zones", "settings/tls_1_3")) # setattr(zones_settings, "tlsadd_auth", - # self._add_with_auth(self._base, "zones", "settings/tlsadd_auth")) + # self._add_with_auth(base, "zones", "settings/tlsadd_auth")) # setattr(zones_settings, "trueadd_ip_header", - # self._add_with_auth(self._base, "zones", "settings/trueadd_ip_header")) + # self._add_with_auth(base, "zones", "settings/trueadd_ip_header")) setattr(zones_settings, "websockets", - self._add_with_auth(self._base, "zones", "settings/websockets")) + self._add_with_auth(base, "zones", "settings/websockets")) setattr(zones_settings, "waf", - self._add_with_auth(self._base, "zones", "settings/waf")) + self._add_with_auth(base, "zones", "settings/waf")) setattr(zones, "analytics", - self._add_unused(self._base, "zones", "analytics")) + self._add_unused(base, "zones", "analytics")) zones_analytics = getattr(zones, "analytics") setattr(zones_analytics, "colos", - self._add_with_auth(self._base, "zones", "analytics/colos")) + self._add_with_auth(base, "zones", "analytics/colos")) setattr(zones_analytics, "dashboard", - self._add_with_auth(self._base, "zones", "analytics/dashboard")) + self._add_with_auth(base, "zones", "analytics/dashboard")) setattr(zones, "firewall", - self._add_unused(self._base, "zones", "firewall")) + self._add_unused(base, "zones", "firewall")) zones_firewall = getattr(zones, "firewall") setattr(zones_firewall, "access_rules", - self._add_unused(self._base, "zones", "firewall/access_rules")) + self._add_unused(base, "zones", "firewall/access_rules")) setattr(zones_firewall, "waf", - self._add_unused(self._base, "zones", "firewall/waf")) + self._add_unused(base, "zones", "firewall/waf")) zones_firewall_waf = getattr(zones_firewall, "waf") setattr(zones_firewall_waf, "packages", - self._add_with_auth(self._base, "zones", "firewall/waf/packages")) + self._add_with_auth(base, "zones", "firewall/waf/packages")) zones_firewall_waf_packages = getattr(zones_firewall_waf, "packages") setattr(zones_firewall_waf_packages, "groups", - self._add_with_auth(self._base, "zones", "firewall/waf/packages", "groups")) + self._add_with_auth(base, "zones", "firewall/waf/packages", "groups")) setattr(zones_firewall_waf_packages, "rules", - self._add_with_auth(self._base, "zones", "firewall/waf/packages", "rules")) + self._add_with_auth(base, "zones", "firewall/waf/packages", "rules")) zones_firewall_access_rules = getattr(zones_firewall, "access_rules") setattr(zones_firewall_access_rules, "rules", - self._add_with_auth(self._base, "zones", "firewall/access_rules/rules")) + self._add_with_auth(base, "zones", "firewall/access_rules/rules")) # The API commands for /railguns/ setattr(self, "railguns", - self._add_with_auth(self._base, "railguns")) + self._add_with_auth(base, "railguns")) railguns = getattr(self, "railguns") setattr(railguns, "zones", - self._add_with_auth(self._base, "railguns", "zones")) + self._add_with_auth(base, "railguns", "zones")) # The API commands for /organizations/ setattr(self, "organizations", - self._add_with_auth(self._base, "organizations")) + self._add_with_auth(base, "organizations")) organizations = getattr(self, "organizations") setattr(organizations, "members", - self._add_with_auth(self._base, "organizations", "members")) + self._add_with_auth(base, "organizations", "members")) setattr(organizations, "invite", - self._add_with_auth(self._base, "organizations", "invite")) + self._add_with_auth(base, "organizations", "invite")) setattr(organizations, "invites", - self._add_with_auth(self._base, "organizations", "invites")) + self._add_with_auth(base, "organizations", "invites")) setattr(organizations, "railguns", - self._add_with_auth(self._base, "organizations", "railguns")) + self._add_with_auth(base, "organizations", "railguns")) organizations_railguns = getattr(organizations, "railguns") setattr(organizations_railguns, "zones", - self._add_with_auth(self._base, "organizations", "railguns", "zones")) + self._add_with_auth(base, "organizations", "railguns", "zones")) setattr(organizations, "roles", - self._add_with_auth(self._base, "organizations", "roles")) + self._add_with_auth(base, "organizations", "roles")) setattr(organizations, "firewall", - self._add_unused(self._base, "organizations", "firewall")) - organizations_firewall = getattr(organizations, "firewall") - setattr(organizations_firewall, "access_rules", - self._add_unused(self._base, "organizations", "firewall/access_rules")) - organizations_firewall_access_rules = getattr(organizations_firewall, "access_rules") - setattr(organizations_firewall_access_rules, "rules", - self._add_with_auth(self._base, "organizations", "firewall/access_rules/rules")) + self._add_unused(base, "organizations", "firewall")) + org_firewall = getattr(organizations, "firewall") + setattr(org_firewall, "access_rules", + self._add_unused(base, "organizations", "firewall/access_rules")) + org_firewall_access_rules = getattr(org_firewall, "access_rules") + setattr(org_firewall_access_rules, "rules", + self._add_with_auth(base, "organizations", "firewall/access_rules/rules")) setattr(organizations, "virtual_dns", - self._add_with_auth(self._base, "organizations", "virtual_dns")) + self._add_with_auth(base, "organizations", "virtual_dns")) # The API commands for /certificates/ setattr(self, "certificates", - self._add_with_cert_auth(self._base, "certificates")) + self._add_with_cert_auth(base, "certificates")) # The API commands for /ips/ setattr(self, "ips", - self._add_noauth(self._base, "ips")) + self._add_noauth(base, "ips")) # The API commands for /zones/:zone_id/dnssec setattr(zones, "dnssec", - self._add_with_auth(self._base, "zones", "dnssec")) + self._add_with_auth(base, "zones", "dnssec")) # The API commands for /zones/:zone_id/ssl setattr(zones, "ssl", - self._add_unused(self._base, "zones", "ssl")) + self._add_unused(base, "zones", "ssl")) zones_ssl = getattr(zones, "ssl") setattr(zones_ssl, "analyze", - self._add_with_auth(self._base, "zones", "ssl/analyze")) + self._add_with_auth(base, "zones", "ssl/analyze")) setattr(zones_ssl, "certificate_packs", - self._add_with_auth(self._base, "zones", "ssl/certificate_packs")) + self._add_with_auth(base, "zones", "ssl/certificate_packs")) setattr(zones_ssl, "verification", - self._add_with_auth(self._base, "zones", "ssl/verification")) + self._add_with_auth(base, "zones", "ssl/verification")) # The API commands for CTM /zones/:zone_id/load_balancers & /user/load_balancers setattr(zones, "load_balancers", - self._add_with_auth(self._base, "zones", "load_balancers")) + self._add_with_auth(base, "zones", "load_balancers")) setattr(user, "load_balancers", - self._add_unused(self._base, "user/load_balancers")) + self._add_unused(base, "user/load_balancers")) user_load_balancers = getattr(user, "load_balancers") setattr(user_load_balancers, "global_policies", - self._add_with_auth(self._base, "user/load_balancers/global_policies")) + self._add_with_auth(base, "user/load_balancers/global_policies")) setattr(user_load_balancers, "monitors", - self._add_with_auth(self._base, "user/load_balancers/monitors")) + self._add_with_auth(base, "user/load_balancers/monitors")) setattr(user_load_balancers, "notifiers", - self._add_with_auth(self._base, "user/load_balancers/notifiers")) + self._add_with_auth(base, "user/load_balancers/notifiers")) setattr(user_load_balancers, "origins", - self._add_with_auth(self._base, "user/load_balancers/origins")) + self._add_with_auth(base, "user/load_balancers/origins")) setattr(user_load_balancers, "pools", - self._add_with_auth(self._base, "user/load_balancers/pools")) + self._add_with_auth(base, "user/load_balancers/pools")) setattr(user_load_balancers, "maps", - self._add_with_auth(self._base, "user/load_balancers/maps")) + self._add_with_auth(base, "user/load_balancers/maps")) user_load_balancers_maps = getattr(user_load_balancers, "maps") setattr(user_load_balancers_maps, "region", - self._add_with_auth(self._base, "user/load_balancers/maps", "region")) + self._add_with_auth(base, "user/load_balancers/maps", "region")) diff --git a/CloudFlare/cloudflare.py b/CloudFlare/cloudflare.py index 29e57ea..6e1b1d4 100644 --- a/CloudFlare/cloudflare.py +++ b/CloudFlare/cloudflare.py @@ -189,20 +189,21 @@ def _call(self, method, headers, if 'success' not in response_data: if 'errors' in response_data: if self.logger: - self.logger.debug('Response: missing success value - assuming success = "False"') + self.logger.debug('Response: assuming success = "False"') response_data['success'] = False else: if 'result' not in response_data: - # Only happens on /certificates call - and should be fixed in /certificates API + # Only happens on /certificates call + # should be fixed in /certificates API if self.logger: - self.logger.debug('Response: missing success and error value - assuming success = "False"') + self.logger.debug('Response: assuming success = "False"') r = response_data response_data['errors'] = [] response_data['errors'].append(r) response_data['success'] = False else: if self.logger: - self.logger.debug('Response: missing success value - assuming success = "True"') + self.logger.debug('Response: assuming success = "True"') response_data['success'] = True if response_data['success'] is False: @@ -218,7 +219,8 @@ def _call(self, method, headers, error_chain = errors['error_chain'] for error in error_chain: if self.logger: - self.logger.debug('Response: error %d %s - chain' % (error['code'], error['message'])) + self.logger.debug('Response: error %d %s - chain' % + (error['code'], error['message'])) if self.logger: self.logger.debug('Response: error %d %s' % (code, message)) raise CloudFlareAPIError(code, message, error_chain) @@ -334,51 +336,51 @@ def get(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_auth('GET', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def patch(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_auth('PATCH', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def post(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_auth('POST', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def put(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_auth('PUT', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def delete(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_auth('DELETE', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) class _add_with_cert_auth(object): """ Cloudflare v4 API""" @@ -395,55 +397,55 @@ def get(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_certauth('GET', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def patch(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_certauth('PATCH', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def post(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_certauth('POST', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def put(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_certauth('PUT', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def delete(self, identifier1=None, identifier2=None, params=None, data=None): """ Cloudflare v4 API""" return self._base.call_with_certauth('DELETE', - self.api_call_part1, - self.api_call_part2, - self.api_call_part3, - identifier1, identifier2, - params, data) + self.api_call_part1, + self.api_call_part2, + self.api_call_part3, + identifier1, identifier2, + params, data) def api_list(self, m=None, s=''): """recursive walk of the api tree returning a list of api calls""" - if m == None: + if m is None: m = self w = [] for n in sorted(dir(m)): diff --git a/CloudFlare/exceptions.py b/CloudFlare/exceptions.py index 47377b2..c139004 100644 --- a/CloudFlare/exceptions.py +++ b/CloudFlare/exceptions.py @@ -38,7 +38,7 @@ def __str__(self): def __len__(self): """ Cloudflare API errors can contain a chain of errors""" - if self.error_chain == None: + if self.error_chain is None: return 0 else: return len(self.error_chain) @@ -51,13 +51,13 @@ def __getitem__(self, ii): def __iter__(self): """ Cloudflare API errors can contain a chain of errors""" - if self.error_chain == None: + if self.error_chain is None: raise StopIteration for e in self.error_chain: yield e def next(self): - if self.error_chain == None: + if self.error_chain is None: raise StopIteration() class CloudFlareAPIError(CloudFlareError): diff --git a/cli4/cli4.py b/cli4/cli4.py index e4e44ae..71aa3bc 100644 --- a/cli4/cli4.py +++ b/cli4/cli4.py @@ -151,7 +151,7 @@ def convert_load_balancers_map_regions(cf, region_name): def dump_commands(cf): """dump a tree of all the known API commands""" w = cf.api_list() - print('\n'.join(w)) + sys.stdout.write('\n'.join(w)) def cli4(args): """Cloudflare API via command line""" @@ -237,20 +237,22 @@ def cli4(args): value = value_string if tag_string == '': # There's no tag; it's just an unnamed list - if params == None: + if params is None: params = [] try: params.append(value) except AttributeError: - exit('cli4: %s=%s - param error. Can\'t mix unnamed and named list' % (tag_string, value_string)) + exit('cli4: %s=%s - param error. Can\'t mix unnamed and named list' % + (tag_string, value_string)) else: - if params == None: + if params is None: params = {} tag = tag_string try: params[tag] = value except TypeError: - exit('cli4: %s=%s - param error. Can\'t mix unnamed and named list' % (tag_string, value_string)) + exit('cli4: %s=%s - param error. Can\'t mix unnamed and named list' % + (tag_string, value_string)) if dump: cf = CloudFlare.CloudFlare() @@ -313,7 +315,10 @@ def cli4(args): identifier2 = element elif (cmd[0] and cmd[0] == 'zones') and (cmd[2] and cmd[2] == 'dns_records'): identifier2 = convert_dns_record_to_identifier(cf, identifier1, element) - elif (cmd[0] == 'user') and (cmd[1] == 'load_balancers') and (cmd[2] == 'maps') and (cmd[4] == 'region'): + elif ((cmd[0] == 'user') and + (cmd[1] == 'load_balancers') and + (cmd[2] == 'maps') and + (cmd[4] == 'region')): identifier2 = convert_load_balancers_map_regions(cf, element) else: exit("/%s/%s :NOT CODED YET 2" % ('/'.join(cmd), element)) @@ -366,7 +371,7 @@ def cli4(args): results = results[0] if output == 'json': - print(json.dumps(results, indent=4, sort_keys=True)) + sys.stdout.write(json.dumps(results, indent=4, sort_keys=True)) if output == 'yaml': - print(yaml.safe_dump(results)) + sys.stdout.write(yaml.safe_dump(results))