Skip to content

Commit

Permalink
Rename entityList to entitylist
Browse files Browse the repository at this point in the history
Added some documentation
  • Loading branch information
aaront committed Dec 7, 2020
1 parent f8bf55b commit 4839597
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
12 changes: 10 additions & 2 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Querying Data
:inherited-members:
:members:

.. autoclass:: EntityList

.. autoclass:: MyGeotabException

.. autoclass:: TimeoutException
Expand All @@ -35,6 +33,16 @@ Date Helpers
Extras
------

EntityList
~~~~~~~~~~

.. autoclass:: mygeotab.ext.entitylist.API
:inherited-members:
:members:

.. autoclass:: mygeotab.ext.entitylist.EntityList
:members:

Data Feed
~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion mygeotab/ext/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .entityList import API
from .entitylist import API
from .feed import DataFeed, DataFeedListener

__all__ = ["API", "DataFeed", "DatafeedListener"]
8 changes: 7 additions & 1 deletion mygeotab/ext/entityList.py → mygeotab/ext/entitylist.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# -*- coding: utf-8 -*-

import six
from mygeotab import api
from six.moves import UserList


class API(api.API):
"""An experimental wrapper around the base MyGeotab API class that adds some helper methods to results when
retrieving results with `get()`.
"""

def get(self, type_name, **parameters):
return EntityList(super().get(type_name, **parameters), type_name=type_name)

Expand Down Expand Up @@ -133,5 +139,5 @@ def to_dataframe(self, normalize=False):
from pandas.io.json import json_normalize

return json_normalize(self.data)

return pandas.DataFrame.from_dict(self.data)
2 changes: 1 addition & 1 deletion tests/test_api_entitylist.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from datetime import datetime

import pytest
from mygeotab.ext.entityList import EntityList
from mygeotab.ext.entitylist import EntityList


class TestEntityList:
Expand Down

0 comments on commit 4839597

Please sign in to comment.