Mercurial > p > roundup > code
comparison roundup/instance.py @ 5810:5258e89e896a
Fix: DeprecationWarning: Using or importing the ABCs from 'collections'
instead of from 'collections.abc' is deprecated, and in 3.8 it will
stop working
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Wed, 12 Jun 2019 21:19:22 -0400 |
| parents | 5a871a250670 |
| children | 8ccb41b477d1 |
comparison
equal
deleted
inserted
replaced
| 5809:936275dfe1fa | 5810:5258e89e896a |
|---|---|
| 31 try: | 31 try: |
| 32 import builtins | 32 import builtins |
| 33 except ImportError: | 33 except ImportError: |
| 34 import __builtin__ as builtins | 34 import __builtin__ as builtins |
| 35 | 35 |
| 36 import collections | 36 try: |
| 37 from collections.abc import Callable | |
| 38 except ImportError: | |
| 39 from collections import Callable | |
| 40 | |
| 37 import os | 41 import os |
| 38 import sys | 42 import sys |
| 39 import warnings | 43 import warnings |
| 40 | 44 |
| 41 from roundup import configuration, mailgw | 45 from roundup import configuration, mailgw |
| 132 } | 136 } |
| 133 | 137 |
| 134 if self.optimize: | 138 if self.optimize: |
| 135 # execute preloaded schema object | 139 # execute preloaded schema object |
| 136 self._exec(self.schema, env) | 140 self._exec(self.schema, env) |
| 137 if isinstance(self.schema_hook, collections.Callable): | 141 if isinstance(self.schema_hook, Callable): |
| 138 self.schema_hook(**env) | 142 self.schema_hook(**env) |
| 139 # use preloaded detectors | 143 # use preloaded detectors |
| 140 detectors = self.detectors | 144 detectors = self.detectors |
| 141 else: | 145 else: |
| 142 # execute the schema file | 146 # execute the schema file |
| 143 self._execfile('schema.py', env) | 147 self._execfile('schema.py', env) |
| 144 if isinstance(self.schema_hook, collections.Callable): | 148 if isinstance(self.schema_hook, Callable): |
| 145 self.schema_hook(**env) | 149 self.schema_hook(**env) |
| 146 # reload extensions and detectors | 150 # reload extensions and detectors |
| 147 for extension in self.get_extensions('extensions'): | 151 for extension in self.get_extensions('extensions'): |
| 148 extension(self) | 152 extension(self) |
| 149 detectors = self.get_extensions('detectors') | 153 detectors = self.get_extensions('detectors') |