Skip to content

Commit 8c980ef

Browse files
committed
Minor docstrings fixes, plain apidocs struct
1 parent 90911eb commit 8c980ef

File tree

4 files changed

+36
-37
lines changed

4 files changed

+36
-37
lines changed

docs/client/apidocs.rst

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,107 @@
11
API Reference
22
=============
33

4-
Module contents
5-
---------------
4+
Client object
5+
-------------
66

77
.. automodule:: scrapinghub.client
88
:members:
99
:undoc-members:
10-
:show-inheritance:
10+
:inherited-members:
1111

1212

13-
Submodules
14-
----------
15-
16-
activity
13+
Activity
1714
--------
1815

1916
.. automodule:: scrapinghub.client.activity
2017
:members:
2118
:undoc-members:
22-
:show-inheritance:
19+
:inherited-members:
2320

24-
collections
21+
Collections
2522
-----------
2623

2724
.. automodule:: scrapinghub.client.collections
2825
:members:
2926
:undoc-members:
30-
:show-inheritance:
27+
:inherited-members:
3128

32-
exceptions
29+
Exceptions
3330
----------
3431

3532
.. automodule:: scrapinghub.client.exceptions
3633
:members:
3734
:undoc-members:
38-
:show-inheritance:
35+
:inherited-members:
3936

40-
frontiers
37+
Frontiers
4138
---------
4239

4340
.. automodule:: scrapinghub.client.frontiers
4441
:members:
4542
:undoc-members:
46-
:show-inheritance:
43+
:inherited-members:
4744

48-
items
45+
Items
4946
-----
5047

5148
.. automodule:: scrapinghub.client.items
5249
:members:
5350
:undoc-members:
54-
:show-inheritance:
51+
:inherited-members:
5552

56-
jobs
53+
Jobs
5754
----
5855

5956
.. automodule:: scrapinghub.client.jobs
6057
:members:
6158
:undoc-members:
62-
:show-inheritance:
59+
:inherited-members:
6360

64-
logs
61+
Logs
6562
----
6663

6764
.. automodule:: scrapinghub.client.logs
6865
:members:
6966
:undoc-members:
70-
:show-inheritance:
67+
:inherited-members:
7168

72-
projects
69+
Projects
7370
--------
7471

7572
.. automodule:: scrapinghub.client.projects
7673
:members:
7774
:undoc-members:
78-
:show-inheritance:
75+
:inherited-members:
7976

80-
requests
77+
Requests
8178
--------
8279

8380
.. automodule:: scrapinghub.client.requests
8481
:members:
8582
:undoc-members:
86-
:show-inheritance:
83+
:inherited-members:
8784

88-
samples
85+
Samples
8986
-------
9087

9188
.. automodule:: scrapinghub.client.samples
9289
:members:
9390
:undoc-members:
94-
:show-inheritance:
91+
:inherited-members:
9592

96-
spiders
93+
Spiders
9794
-------
9895

9996
.. automodule:: scrapinghub.client.spiders
10097
:members:
10198
:undoc-members:
102-
:show-inheritance:
99+
:inherited-members:
103100

104-
utils
101+
Utils
105102
-----
106103

107104
.. automodule:: scrapinghub.client.utils
108105
:members:
109106
:undoc-members:
110-
:show-inheritance:
107+
:inherited-members:

docs/client/overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Project
5151

5252
Project instance has ``jobs`` field to work with the project jobs.
5353

54-
Jobs instance is described well in ``Jobs`` section below.
54+
Jobs instance is described well in :ref:`Jobs <jobs>` section below.
5555

5656
For example, to schedule a spider run (it returns a job object)::
5757

scrapinghub/client/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class ScrapinghubClient(object):
3333
:param \*\*kwargs: (optional) Additional arguments for
3434
:class:`scrapinghub.hubstorage.HubstorageClient` constructor.
3535
36-
:ivar projects: projects collection, :class:`Projects` instance.
36+
:ivar projects: projects collection,
37+
:class:`scrapinghub.client.projects.Projects` instance.
3738
3839
Usage::
3940
@@ -52,12 +53,13 @@ def __init__(self, auth=None, dash_endpoint=None, **kwargs):
5253
self._hsclient = HubstorageClient(auth=(login, password), **kwargs)
5354

5455
def get_project(self, project_id):
55-
"""Get :class:`Project` instance with a given project id.
56+
"""Get :class:`scrapinghub.client.projects.Project` instance with
57+
a given project id.
5658
5759
The method is a shortcut for client.projects.get().
5860
5961
:param project_id: integer or string numeric project id.
60-
:return: :class:`Project` object.
62+
:return: a project instance.
6163
:rtype: :class:`scrapinghub.client.projects.Project`
6264
6365
Usage::
@@ -73,7 +75,7 @@ def get_job(self, job_key):
7375
7476
:param job_key: job key string in format 'project_id/spider_id/job_id',
7577
where all the components are integers.
76-
:return: :class:`Job` object.
78+
:return: a job instance.
7779
:rtype: :class:`scrapinghub.client.jobs.Job`
7880
7981
Usage::

scrapinghub/client/projects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class Projects(object):
1616
"""Collection of projects available to current user.
1717
18-
Not a public constructor: use :class:`Scrapinghub` client instance to get
18+
Not a public constructor: use :class:`ScrapinghubClient` client instance to get
1919
a :class:`Projects` instance. See :attr:`Scrapinghub.projects` attribute.
2020
2121
Usage::
@@ -98,7 +98,7 @@ class Project(object):
9898
9999
Not a public constructor: use :class:`ScrapinghubClient` instance or
100100
:class:`Projects` instance to get a :class:`Project` instance. See
101-
:meth:`Scrapinghub.get_project` or :meth:`Projects.get` methods.
101+
:meth:`ScrapinghubClient.get_project` or :meth:`Projects.get` methods.
102102
103103
:ivar key: string project id.
104104
:ivar activity: :class:`Activity` resource object.

0 commit comments

Comments
 (0)