Skip to content

Commit 8cc55be

Browse files
committed
Add flake8 configuration file and correct reported linting errors
1 parent 5316af3 commit 8cc55be

File tree

7 files changed

+25
-11
lines changed

7 files changed

+25
-11
lines changed

.flake8

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[flake8]
2+
ignore = E402,F401,F403
3+
exclude =
4+
.git,
5+
__pycache__,
6+
ciscosparkapi/_version.py,
7+
docs/source/conf.py,
8+
build,
9+
dist,

ciscosparkapi/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
from ciscosparkapi.api.memberships import Membership, MembershipsAPI
2323
from ciscosparkapi.api.messages import Message, MessagesAPI
2424
from ciscosparkapi.api.teams import Team, TeamsAPI
25-
from ciscosparkapi.api.teammemberships import TeamMembership, TeamMembershipsAPI
25+
from ciscosparkapi.api.teammemberships import (
26+
TeamMembership,
27+
TeamMembershipsAPI
28+
)
2629
from ciscosparkapi.api.webhooks import Webhook, WebhooksAPI
2730
from ciscosparkapi.api.organizations import Organization, OrganizationsAPI
2831
from ciscosparkapi.api.licenses import License, LicensesAPI

ciscosparkapi/api/rooms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def list(self, max=None, **query_params):
147147
params = {}
148148
if max:
149149
params['max'] = max
150-
# Process query_param keyword arguments
150+
# Process query_param keyword arguments
151151
if query_params:
152152
params.update(query_params)
153153
# API request - get items

ciscosparkapi/api/teammemberships.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ def update(self, membershipId, **update_attributes):
243243
raise ciscosparkapiException(error_message)
244244
# API request
245245
json_obj = self._session.put('team/memberships/' + membershipId,
246-
json=update_attributes)
246+
json=update_attributes)
247247
# Return a TeamMembership object created from the response JSON data
248248
return TeamMembership(json_obj)
249249

ciscosparkapi/api/teams.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ def update(self, teamId, **update_attributes):
189189
"argument must be specified."
190190
raise ciscosparkapiException(error_message)
191191
# API request
192-
json_obj = self._session.post('teams/' + teamId, json=update_attributes)
192+
json_obj = self._session.post('teams/' + teamId,
193+
json=update_attributes)
193194
# Return a Team object created from the response JSON data
194195
return Team(json_obj)
195196

ciscosparkapi/sparkdata.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
to objects by the Cisco Spark cloud.
1515
1616
Example:
17-
>>> json_obj = '{"created": "2012-06-15T20:36:48.914Z", "displayName": "Chris Lunsford (chrlunsf)", "id": "Y2lzY29zcGFyazovL3VzL1BFT1BMRS9mZjhlZTZmYi1hZmVmLTRhNGQtOTJiMS1kNmIyMTZiNTg5NDk", "avatar": "https://1efa7a94ed216783e352-c62266528714497a17239ececf39e9e2.ssl.cf1.rackcdn.com/V1~ba1ecf557a7e0b7cc3081998df965aad~cNFKqEjAQ5aQkyt_l1zsCQ==~1600", "emails": ["[email protected]"]}'
17+
>>> json_obj = '{"created": "2012-06-15T20:36:48.914Z",
18+
"displayName": "Chris Lunsford (chrlunsf)",
19+
"id": "Y2lzY29zcGFyazovL3VzL1BFT1BMRS9mZjhlZTZmYi1hZm...",
20+
"avatar": "https://1efa7a94ed216783e352-c622665287144...",
21+
"emails": ["[email protected]"]}'
1822
>>> python_obj = SparkData(json_obj)
1923
>>> python_obj.displayName
2024
u'Chris Lunsford (chrlunsf)'

ciscosparkapi/utils.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,9 @@ def is_web_url(string):
5454
"""Check to see if string is an validly-formatted web url."""
5555
assert isinstance(string, str)
5656
parsed_url = urllib.parse.urlparse(string)
57-
if (parsed_url.scheme.lower() == 'http' \
58-
or parsed_url.scheme.lower() == 'https') \
59-
and parsed_url.netloc:
60-
return True
61-
else:
62-
return False
57+
return ((parsed_url.scheme.lower() == 'http' or
58+
parsed_url.scheme.lower() == 'https') and
59+
parsed_url.netloc)
6360

6461

6562
def is_local_file(string):

0 commit comments

Comments
 (0)