diff --git a/consulate/cli.py b/consulate/cli.py index e2d12ba..67e148f 100644 --- a/consulate/cli.py +++ b/consulate/cli.py @@ -620,8 +620,14 @@ def main(): if args.api_host: api_host = args.api_host - consul = consulate.Consul(api_host, port, args.dc, - args.token, args.api_scheme, adapter) + consul = consulate.Consul( + host=api_host, + port=port, + datacenter=args.dc, + token=args.token, + scheme=args.api_scheme, + adapter=adapter, + ) if args.command == 'acl': ACL_ACTIONS[args.action](consul, args) diff --git a/consulate/models/base.py b/consulate/models/base.py index 50802bf..e797da2 100644 --- a/consulate/models/base.py +++ b/consulate/models/base.py @@ -6,7 +6,7 @@ import collections -class Model(collections.Iterable): +class Model(collections.abc.Iterable): """A model contains an __attribute__ map that defines the name, its type for type validation, an optional validation method, a method used to diff --git a/setup.py b/setup.py index 2eeb10e..bf062d9 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ import setuptools setuptools.setup( - name='abaez.consulate', - version='1.1.0', + name='consulate', + version='1.1.2', description='A Client library and command line application for the Consul', maintainer='Gavin M. Roy', maintainer_email='gavinr@aweber.com',