From a6c743b6b58c94e4d1a82d0d5b23ffcf66e50462 Mon Sep 17 00:00:00 2001 From: foodszhang Date: Wed, 29 Aug 2018 11:37:30 +0800 Subject: [PATCH] Revert "Revert "resolver"" This reverts commit c309463b239c015b85e41a8c69597106754d8c88. Conflicts: swagger_py_codegen/parser.py --- swagger_py_codegen/parser.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/swagger_py_codegen/parser.py b/swagger_py_codegen/parser.py index ccbd4c2..e44fabe 100644 --- a/swagger_py_codegen/parser.py +++ b/swagger_py_codegen/parser.py @@ -19,8 +19,6 @@ def __init__(self, data, ref): self.ref = ref self._data = data -<<<<<<< HEAD - def __getitem__(self, key): return self._data.__getitem__(key) @@ -29,22 +27,6 @@ def __setitem__(self, key, value): def __getattr__(self, key): return self._data.__getattribute__(key) -======= - def __getitem__(self, key): - return self._data.__getitem__(key) - - def __settiem__(self, key, value): - return self._data.__settiem__(key, value) - - def get(self, key, default=None): - return self._data.get(key, default) - - def has(self, key, default=None): - return self._data.has(key) - - def keys(self): - return self._data.keys() ->>>>>>> parent of c309463... Revert "resolver" def __iter__(self): return self._data.__iter__()