holm/httpie-cli
1
1
Fork 0
forked from extern/httpie-cli
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start using dict comprehensions

Browse Source
This commit is contained in:
Jakub Roztocil 2017-12-28 18:15:17 +01:00
parent ec899d70b7
commit 7f5fd130c5
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpie/__init__.py
View File

@ -25,8 +25,8 @@ class ExitStatus:
ERROR_HTTP_5XX = 5 ERROR_HTTP_5XX = 5
EXIT_STATUS_LABELS = dict( EXIT_STATUS_LABELS = {
(value, key) value: key
for key, value in ExitStatus.__dict__.items() for key, value in ExitStatus.__dict__.items()
if key.isupper() if key.isupper()
) }

2
httpie/client.py
View File

@ -166,7 +166,7 @@ def get_requests_kwargs(args, base_headers=None):
'cert': cert, 'cert': cert,
'timeout': args.timeout, 'timeout': args.timeout,
'auth': args.auth, 'auth': args.auth,
'proxies': dict((p.key, p.value) for p in args.proxy), 'proxies': {p.key: p.value for p in args.proxy},
'files': args.files, 'files': args.files,
'allow_redirects': args.follow, 'allow_redirects': args.follow,
'params': args.params, 'params': args.params,

6
httpie/input.py
View File

@ -112,11 +112,11 @@ SSL_VERSION_ARG_MAPPING = {
'tls1.1': 'PROTOCOL_TLSv1_1', 'tls1.1': 'PROTOCOL_TLSv1_1',
'tls1.2': 'PROTOCOL_TLSv1_2', 'tls1.2': 'PROTOCOL_TLSv1_2',
} }
SSL_VERSION_ARG_MAPPING = dict( SSL_VERSION_ARG_MAPPING = {
(cli_arg, getattr(ssl, ssl_constant)) cli_arg: getattr(ssl, ssl_constant)
for cli_arg, ssl_constant in SSL_VERSION_ARG_MAPPING.items() for cli_arg, ssl_constant in SSL_VERSION_ARG_MAPPING.items()
if hasattr(ssl, ssl_constant) if hasattr(ssl, ssl_constant)
) }
class HTTPieArgumentParser(ArgumentParser): class HTTPieArgumentParser(ArgumentParser):

3
httpie/plugins/manager.py
View File

@ -39,8 +39,7 @@ class PluginManager(object):
return [plugin for plugin in self if issubclass(plugin, AuthPlugin)] return [plugin for plugin in self if issubclass(plugin, AuthPlugin)]
def get_auth_plugin_mapping(self): def get_auth_plugin_mapping(self):
return dict((plugin.auth_type, plugin) return {plugin.auth_type: plugin for plugin in self.get_auth_plugins()}
for plugin in self.get_auth_plugins())
def get_auth_plugin(self, auth_type): def get_auth_plugin(self, auth_type):
return self.get_auth_plugin_mapping()[auth_type] return self.get_auth_plugin_mapping()[auth_type]

6
httpie/sessions.py
View File

@ -136,10 +136,10 @@ class Session(BaseConfigDict):
stored_attrs = ['value', 'path', 'secure', 'expires'] stored_attrs = ['value', 'path', 'secure', 'expires']
self['cookies'] = {} self['cookies'] = {}
for cookie in jar: for cookie in jar:
self['cookies'][cookie.name] = dict( self['cookies'][cookie.name] = {
(attname, getattr(cookie, attname)) attname: getattr(cookie, attname)
for attname in stored_attrs for attname in stored_attrs
) }
@property @property
def auth(self): def auth(self):