diff -r 69aa17b1f894 Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py Wed Jan 13 07:48:57 2016 -0800 +++ b/Lib/importlib/_bootstrap.py Wed Jan 13 16:17:05 2016 -0500 @@ -1032,8 +1032,14 @@ to represent that its proper value is unknown. """ + spec = globals.get('__spec__') + if spec and hasattr(spec, 'parent'): + return spec.parent package = globals.get('__package__') if package is None: + _warnings.warn('can\'t resolve package from __spec__ or __package__, ' + 'falling back on __name__ and __path__', + ImportWarning) package = globals['__name__'] if '__path__' not in globals: package = package.rpartition('.')[0] diff -r 69aa17b1f894 Lib/test/test_importlib/import_/test___package__.py --- a/Lib/test/test_importlib/import_/test___package__.py Wed Jan 13 07:48:57 2016 -0800 +++ b/Lib/test/test_importlib/import_/test___package__.py Wed Jan 13 16:17:05 2016 -0500 @@ -33,31 +33,39 @@ """ - def test_using___package__(self): - # [__package__] + def import_module(self, globals_): with self.mock_modules('pkg.__init__', 'pkg.fake') as importer: with util.import_state(meta_path=[importer]): self.__import__('pkg.fake') module = self.__import__('', - globals={'__package__': 'pkg.fake'}, + globals=globals_, fromlist=['attr'], level=2) + return module + + def test_using___package__(self): + # [__package__] + module = self.import_module({'__package__': 'pkg.fake'}) self.assertEqual(module.__name__, 'pkg') - def test_using___name__(self, package_as_None=False): + def test_using___name__(self): # [__name__] - globals_ = {'__name__': 'pkg.fake', '__path__': []} - if package_as_None: - globals_['__package__'] = None - with self.mock_modules('pkg.__init__', 'pkg.fake') as importer: - with util.import_state(meta_path=[importer]): - self.__import__('pkg.fake') - module = self.__import__('', globals= globals_, - fromlist=['attr'], level=2) - self.assertEqual(module.__name__, 'pkg') + module = self.import_module({'__name__': 'pkg.fake', '__path__': []}) + self.assertEqual(module.__name__, 'pkg') + + def test_warn_when_using___name__(self): + with self.assertWarns(ImportWarning): + self.import_module({'__name__': 'pkg.fake', '__path__': []}) def test_None_as___package__(self): # [None] - self.test_using___name__(package_as_None=True) + module = self.import_module({ + '__name__': 'pkg.fake', '__path__': [], '__package__': None }) + self.assertEqual(module.__name__, 'pkg') + + def test_prefers___spec__(self): + globals = {'__spec__': FakeSpec()} + with self.assertRaises(SystemError): + self.__import__('', globals, {}, ['relimport'], 1) def test_bad__package__(self): globals = {'__package__': ''} @@ -70,6 +78,10 @@ self.__import__('', globals, {}, ['relimport'], 1) +class FakeSpec: + parent = '' + + class Using__package__PEP302(Using__package__): mock_modules = util.mock_modules diff -r 69aa17b1f894 Python/import.c --- a/Python/import.c Wed Jan 13 07:48:57 2016 -0800 +++ b/Python/import.c Wed Jan 13 16:17:05 2016 -0500 @@ -1359,6 +1359,7 @@ PyObject *final_mod = NULL; PyObject *mod = NULL; PyObject *package = NULL; + PyObject *spec = NULL; PyObject *globals = NULL; PyObject *fromlist = NULL; PyInterpreterState *interp = PyThreadState_GET()->interp; @@ -1414,39 +1415,56 @@ goto error; } else if (level > 0) { - package = _PyDict_GetItemId(globals, &PyId___package__); - if (package != NULL && package != Py_None) { - Py_INCREF(package); + spec = _PyDict_GetItemId(globals, &PyId___spec__); + if (spec && (package = PyObject_GetAttrString(spec, "parent"))) { if (!PyUnicode_Check(package)) { - PyErr_SetString(PyExc_TypeError, "package must be a string"); + PyErr_SetString(PyExc_TypeError, + "__spec__.parent must be a string"); goto error; } + Py_INCREF(package); } else { - package = _PyDict_GetItemId(globals, &PyId___name__); - if (package == NULL) { - PyErr_SetString(PyExc_KeyError, "'__name__' not in globals"); - goto error; - } - else if (!PyUnicode_Check(package)) { - PyErr_SetString(PyExc_TypeError, "__name__ must be a string"); - } - Py_INCREF(package); - - if (_PyDict_GetItemId(globals, &PyId___path__) == NULL) { - PyObject *partition = NULL; - PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot); - if (borrowed_dot == NULL) { + package = _PyDict_GetItemId(globals, &PyId___package__); + if (package != NULL && package != Py_None) { + Py_INCREF(package); + if (!PyUnicode_Check(package)) { + PyErr_SetString(PyExc_TypeError, "package must be a string"); goto error; } - partition = PyUnicode_RPartition(package, borrowed_dot); - Py_DECREF(package); - if (partition == NULL) { + } + else { + if (PyErr_WarnEx(PyExc_ImportWarning, + "can't resolve package from __spec__ or __package__, " + "falling back on __name__ and __path__", 1) < 0) { goto error; } - package = PyTuple_GET_ITEM(partition, 0); + + package = _PyDict_GetItemId(globals, &PyId___name__); + if (package == NULL) { + PyErr_SetString(PyExc_KeyError, "'__name__' not in globals"); + goto error; + } + else if (!PyUnicode_Check(package)) { + PyErr_SetString(PyExc_TypeError, "__name__ must be a string"); + } Py_INCREF(package); - Py_DECREF(partition); + + if (_PyDict_GetItemId(globals, &PyId___path__) == NULL) { + PyObject *partition = NULL; + PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot); + if (borrowed_dot == NULL) { + goto error; + } + partition = PyUnicode_RPartition(package, borrowed_dot); + Py_DECREF(package); + if (partition == NULL) { + goto error; + } + package = PyTuple_GET_ITEM(partition, 0); + Py_INCREF(package); + Py_DECREF(partition); + } } } diff -r 69aa17b1f894 Python/importlib.h --- a/Python/importlib.h Wed Jan 13 07:48:57 2016 -0800 +++ b/Python/importlib.h Wed Jan 13 16:17:05 2016 -0500 @@ -1787,202 +1787,215 @@ 115,116,228,3,0,0,115,34,0,0,0,0,10,15,1,12, 1,12,1,13,1,15,1,16,1,13,1,15,1,21,1,3, 1,17,1,18,4,21,1,15,1,3,1,26,1,114,194,0, - 0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,2, - 0,0,0,67,0,0,0,115,72,0,0,0,124,0,0,106, - 0,0,100,1,0,131,1,0,125,1,0,124,1,0,100,2, - 0,107,8,0,114,68,0,124,0,0,100,3,0,25,125,1, - 0,100,4,0,124,0,0,107,7,0,114,68,0,124,1,0, - 106,1,0,100,5,0,131,1,0,100,6,0,25,125,1,0, - 124,1,0,83,41,7,122,167,67,97,108,99,117,108,97,116, - 101,32,119,104,97,116,32,95,95,112,97,99,107,97,103,101, - 95,95,32,115,104,111,117,108,100,32,98,101,46,10,10,32, - 32,32,32,95,95,112,97,99,107,97,103,101,95,95,32,105, - 115,32,110,111,116,32,103,117,97,114,97,110,116,101,101,100, - 32,116,111,32,98,101,32,100,101,102,105,110,101,100,32,111, - 114,32,99,111,117,108,100,32,98,101,32,115,101,116,32,116, - 111,32,78,111,110,101,10,32,32,32,32,116,111,32,114,101, - 112,114,101,115,101,110,116,32,116,104,97,116,32,105,116,115, - 32,112,114,111,112,101,114,32,118,97,108,117,101,32,105,115, - 32,117,110,107,110,111,119,110,46,10,10,32,32,32,32,114, - 134,0,0,0,78,114,1,0,0,0,114,131,0,0,0,114, - 121,0,0,0,114,33,0,0,0,41,2,114,42,0,0,0, - 114,122,0,0,0,41,2,218,7,103,108,111,98,97,108,115, - 114,169,0,0,0,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,17,95,99,97,108,99,95,95,95,112,97, - 99,107,97,103,101,95,95,4,4,0,0,115,12,0,0,0, - 0,7,15,1,12,1,10,1,12,1,19,1,114,196,0,0, - 0,99,5,0,0,0,0,0,0,0,9,0,0,0,5,0, - 0,0,67,0,0,0,115,227,0,0,0,124,4,0,100,1, - 0,107,2,0,114,27,0,116,0,0,124,0,0,131,1,0, - 125,5,0,110,54,0,124,1,0,100,2,0,107,9,0,114, - 45,0,124,1,0,110,3,0,105,0,0,125,6,0,116,1, - 0,124,6,0,131,1,0,125,7,0,116,0,0,124,0,0, - 124,7,0,124,4,0,131,3,0,125,5,0,124,3,0,115, - 207,0,124,4,0,100,1,0,107,2,0,114,122,0,116,0, - 0,124,0,0,106,2,0,100,3,0,131,1,0,100,1,0, - 25,131,1,0,83,124,0,0,115,132,0,124,5,0,83,116, - 3,0,124,0,0,131,1,0,116,3,0,124,0,0,106,2, - 0,100,3,0,131,1,0,100,1,0,25,131,1,0,24,125, - 8,0,116,4,0,106,5,0,124,5,0,106,6,0,100,2, - 0,116,3,0,124,5,0,106,6,0,131,1,0,124,8,0, - 24,133,2,0,25,25,83,110,16,0,116,7,0,124,5,0, - 124,3,0,116,0,0,131,3,0,83,100,2,0,83,41,4, - 97,214,1,0,0,73,109,112,111,114,116,32,97,32,109,111, - 100,117,108,101,46,10,10,32,32,32,32,84,104,101,32,39, - 103,108,111,98,97,108,115,39,32,97,114,103,117,109,101,110, - 116,32,105,115,32,117,115,101,100,32,116,111,32,105,110,102, - 101,114,32,119,104,101,114,101,32,116,104,101,32,105,109,112, - 111,114,116,32,105,115,32,111,99,99,117,114,105,110,103,32, - 102,114,111,109,10,32,32,32,32,116,111,32,104,97,110,100, - 108,101,32,114,101,108,97,116,105,118,101,32,105,109,112,111, - 114,116,115,46,32,84,104,101,32,39,108,111,99,97,108,115, - 39,32,97,114,103,117,109,101,110,116,32,105,115,32,105,103, - 110,111,114,101,100,46,32,84,104,101,10,32,32,32,32,39, - 102,114,111,109,108,105,115,116,39,32,97,114,103,117,109,101, - 110,116,32,115,112,101,99,105,102,105,101,115,32,119,104,97, - 116,32,115,104,111,117,108,100,32,101,120,105,115,116,32,97, - 115,32,97,116,116,114,105,98,117,116,101,115,32,111,110,32, - 116,104,101,32,109,111,100,117,108,101,10,32,32,32,32,98, - 101,105,110,103,32,105,109,112,111,114,116,101,100,32,40,101, - 46,103,46,32,96,96,102,114,111,109,32,109,111,100,117,108, - 101,32,105,109,112,111,114,116,32,60,102,114,111,109,108,105, - 115,116,62,96,96,41,46,32,32,84,104,101,32,39,108,101, - 118,101,108,39,10,32,32,32,32,97,114,103,117,109,101,110, - 116,32,114,101,112,114,101,115,101,110,116,115,32,116,104,101, - 32,112,97,99,107,97,103,101,32,108,111,99,97,116,105,111, - 110,32,116,111,32,105,109,112,111,114,116,32,102,114,111,109, - 32,105,110,32,97,32,114,101,108,97,116,105,118,101,10,32, - 32,32,32,105,109,112,111,114,116,32,40,101,46,103,46,32, - 96,96,102,114,111,109,32,46,46,112,107,103,32,105,109,112, - 111,114,116,32,109,111,100,96,96,32,119,111,117,108,100,32, - 104,97,118,101,32,97,32,39,108,101,118,101,108,39,32,111, - 102,32,50,41,46,10,10,32,32,32,32,114,33,0,0,0, - 78,114,121,0,0,0,41,8,114,186,0,0,0,114,196,0, - 0,0,218,9,112,97,114,116,105,116,105,111,110,114,167,0, - 0,0,114,14,0,0,0,114,21,0,0,0,114,1,0,0, - 0,114,194,0,0,0,41,9,114,15,0,0,0,114,195,0, - 0,0,218,6,108,111,99,97,108,115,114,192,0,0,0,114, - 170,0,0,0,114,89,0,0,0,90,8,103,108,111,98,97, - 108,115,95,114,169,0,0,0,90,7,99,117,116,95,111,102, - 102,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, - 218,10,95,95,105,109,112,111,114,116,95,95,19,4,0,0, - 115,26,0,0,0,0,11,12,1,15,2,24,1,12,1,18, - 1,6,3,12,1,23,1,6,1,4,4,35,3,40,2,114, - 199,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0, - 0,3,0,0,0,67,0,0,0,115,53,0,0,0,116,0, - 0,106,1,0,124,0,0,131,1,0,125,1,0,124,1,0, - 100,0,0,107,8,0,114,43,0,116,2,0,100,1,0,124, - 0,0,23,131,1,0,130,1,0,116,3,0,124,1,0,131, - 1,0,83,41,2,78,122,25,110,111,32,98,117,105,108,116, - 45,105,110,32,109,111,100,117,108,101,32,110,97,109,101,100, - 32,41,4,114,150,0,0,0,114,154,0,0,0,114,77,0, - 0,0,114,149,0,0,0,41,2,114,15,0,0,0,114,88, + 0,0,99,1,0,0,0,0,0,0,0,3,0,0,0,3, + 0,0,0,67,0,0,0,115,131,0,0,0,124,0,0,106, + 0,0,100,1,0,131,1,0,125,1,0,124,1,0,114,43, + 0,116,1,0,124,1,0,100,2,0,131,2,0,114,43,0, + 124,1,0,106,2,0,83,124,0,0,106,0,0,100,3,0, + 131,1,0,125,2,0,124,2,0,100,4,0,107,8,0,114, + 127,0,116,3,0,106,4,0,100,5,0,116,5,0,131,2, + 0,1,124,0,0,100,6,0,25,125,2,0,100,7,0,124, + 0,0,107,7,0,114,127,0,124,2,0,106,6,0,100,8, + 0,131,1,0,100,9,0,25,125,2,0,124,2,0,83,41, + 10,122,167,67,97,108,99,117,108,97,116,101,32,119,104,97, + 116,32,95,95,112,97,99,107,97,103,101,95,95,32,115,104, + 111,117,108,100,32,98,101,46,10,10,32,32,32,32,95,95, + 112,97,99,107,97,103,101,95,95,32,105,115,32,110,111,116, + 32,103,117,97,114,97,110,116,101,101,100,32,116,111,32,98, + 101,32,100,101,102,105,110,101,100,32,111,114,32,99,111,117, + 108,100,32,98,101,32,115,101,116,32,116,111,32,78,111,110, + 101,10,32,32,32,32,116,111,32,114,101,112,114,101,115,101, + 110,116,32,116,104,97,116,32,105,116,115,32,112,114,111,112, + 101,114,32,118,97,108,117,101,32,105,115,32,117,110,107,110, + 111,119,110,46,10,10,32,32,32,32,114,95,0,0,0,114, + 123,0,0,0,114,134,0,0,0,78,122,89,99,97,110,39, + 116,32,114,101,115,111,108,118,101,32,112,97,99,107,97,103, + 101,32,102,114,111,109,32,95,95,115,112,101,99,95,95,32, + 111,114,32,95,95,112,97,99,107,97,103,101,95,95,44,32, + 102,97,108,108,105,110,103,32,98,97,99,107,32,111,110,32, + 95,95,110,97,109,101,95,95,32,97,110,100,32,95,95,112, + 97,116,104,95,95,114,1,0,0,0,114,131,0,0,0,114, + 121,0,0,0,114,33,0,0,0,41,7,114,42,0,0,0, + 114,4,0,0,0,114,123,0,0,0,114,141,0,0,0,114, + 142,0,0,0,114,175,0,0,0,114,122,0,0,0,41,3, + 218,7,103,108,111,98,97,108,115,114,88,0,0,0,114,169, 0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0, - 0,0,218,18,95,98,117,105,108,116,105,110,95,102,114,111, - 109,95,110,97,109,101,54,4,0,0,115,8,0,0,0,0, - 1,15,1,12,1,16,1,114,200,0,0,0,99,2,0,0, - 0,0,0,0,0,12,0,0,0,12,0,0,0,67,0,0, - 0,115,74,1,0,0,124,1,0,97,0,0,124,0,0,97, - 1,0,116,2,0,116,1,0,131,1,0,125,2,0,120,123, - 0,116,1,0,106,3,0,106,4,0,131,0,0,68,93,106, - 0,92,2,0,125,3,0,125,4,0,116,5,0,124,4,0, - 124,2,0,131,2,0,114,40,0,124,3,0,116,1,0,106, - 6,0,107,6,0,114,91,0,116,7,0,125,5,0,110,27, - 0,116,0,0,106,8,0,124,3,0,131,1,0,114,40,0, - 116,9,0,125,5,0,110,3,0,113,40,0,116,10,0,124, - 4,0,124,5,0,131,2,0,125,6,0,116,11,0,124,6, - 0,124,4,0,131,2,0,1,113,40,0,87,116,1,0,106, - 3,0,116,12,0,25,125,7,0,120,73,0,100,5,0,68, - 93,65,0,125,8,0,124,8,0,116,1,0,106,3,0,107, - 7,0,114,206,0,116,13,0,124,8,0,131,1,0,125,9, - 0,110,13,0,116,1,0,106,3,0,124,8,0,25,125,9, - 0,116,14,0,124,7,0,124,8,0,124,9,0,131,3,0, - 1,113,170,0,87,121,16,0,116,13,0,100,2,0,131,1, - 0,125,10,0,87,110,24,0,4,116,15,0,107,10,0,114, - 25,1,1,1,1,100,3,0,125,10,0,89,110,1,0,88, - 116,14,0,124,7,0,100,2,0,124,10,0,131,3,0,1, - 116,13,0,100,4,0,131,1,0,125,11,0,116,14,0,124, - 7,0,100,4,0,124,11,0,131,3,0,1,100,3,0,83, - 41,6,122,250,83,101,116,117,112,32,105,109,112,111,114,116, - 108,105,98,32,98,121,32,105,109,112,111,114,116,105,110,103, - 32,110,101,101,100,101,100,32,98,117,105,108,116,45,105,110, - 32,109,111,100,117,108,101,115,32,97,110,100,32,105,110,106, - 101,99,116,105,110,103,32,116,104,101,109,10,32,32,32,32, - 105,110,116,111,32,116,104,101,32,103,108,111,98,97,108,32, - 110,97,109,101,115,112,97,99,101,46,10,10,32,32,32,32, - 65,115,32,115,121,115,32,105,115,32,110,101,101,100,101,100, - 32,102,111,114,32,115,121,115,46,109,111,100,117,108,101,115, - 32,97,99,99,101,115,115,32,97,110,100,32,95,105,109,112, - 32,105,115,32,110,101,101,100,101,100,32,116,111,32,108,111, - 97,100,32,98,117,105,108,116,45,105,110,10,32,32,32,32, - 109,111,100,117,108,101,115,44,32,116,104,111,115,101,32,116, - 119,111,32,109,111,100,117,108,101,115,32,109,117,115,116,32, - 98,101,32,101,120,112,108,105,99,105,116,108,121,32,112,97, - 115,115,101,100,32,105,110,46,10,10,32,32,32,32,114,141, - 0,0,0,114,34,0,0,0,78,114,62,0,0,0,41,1, - 122,9,95,119,97,114,110,105,110,103,115,41,16,114,57,0, - 0,0,114,14,0,0,0,114,13,0,0,0,114,21,0,0, - 0,218,5,105,116,101,109,115,114,177,0,0,0,114,76,0, - 0,0,114,150,0,0,0,114,82,0,0,0,114,160,0,0, - 0,114,132,0,0,0,114,137,0,0,0,114,1,0,0,0, - 114,200,0,0,0,114,5,0,0,0,114,77,0,0,0,41, - 12,218,10,115,121,115,95,109,111,100,117,108,101,218,11,95, - 105,109,112,95,109,111,100,117,108,101,90,11,109,111,100,117, - 108,101,95,116,121,112,101,114,15,0,0,0,114,89,0,0, - 0,114,99,0,0,0,114,88,0,0,0,90,11,115,101,108, - 102,95,109,111,100,117,108,101,90,12,98,117,105,108,116,105, - 110,95,110,97,109,101,90,14,98,117,105,108,116,105,110,95, - 109,111,100,117,108,101,90,13,116,104,114,101,97,100,95,109, - 111,100,117,108,101,90,14,119,101,97,107,114,101,102,95,109, - 111,100,117,108,101,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,6,95,115,101,116,117,112,61,4,0,0, - 115,50,0,0,0,0,9,6,1,6,3,12,1,28,1,15, - 1,15,1,9,1,15,1,9,2,3,1,15,1,17,3,13, - 1,13,1,15,1,15,2,13,1,20,3,3,1,16,1,13, - 2,11,1,16,3,12,1,114,204,0,0,0,99,2,0,0, - 0,0,0,0,0,3,0,0,0,3,0,0,0,67,0,0, - 0,115,87,0,0,0,116,0,0,124,0,0,124,1,0,131, - 2,0,1,116,1,0,106,2,0,106,3,0,116,4,0,131, - 1,0,1,116,1,0,106,2,0,106,3,0,116,5,0,131, - 1,0,1,100,1,0,100,2,0,108,6,0,125,2,0,124, - 2,0,97,7,0,124,2,0,106,8,0,116,1,0,106,9, - 0,116,10,0,25,131,1,0,1,100,2,0,83,41,3,122, - 50,73,110,115,116,97,108,108,32,105,109,112,111,114,116,108, - 105,98,32,97,115,32,116,104,101,32,105,109,112,108,101,109, - 101,110,116,97,116,105,111,110,32,111,102,32,105,109,112,111, - 114,116,46,114,33,0,0,0,78,41,11,114,204,0,0,0, - 114,14,0,0,0,114,174,0,0,0,114,113,0,0,0,114, - 150,0,0,0,114,160,0,0,0,218,26,95,102,114,111,122, - 101,110,95,105,109,112,111,114,116,108,105,98,95,101,120,116, - 101,114,110,97,108,114,119,0,0,0,218,8,95,105,110,115, - 116,97,108,108,114,21,0,0,0,114,1,0,0,0,41,3, - 114,202,0,0,0,114,203,0,0,0,114,205,0,0,0,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,206, - 0,0,0,108,4,0,0,115,12,0,0,0,0,2,13,2, - 16,1,16,3,12,1,6,1,114,206,0,0,0,41,51,114, - 3,0,0,0,114,119,0,0,0,114,12,0,0,0,114,16, - 0,0,0,114,17,0,0,0,114,59,0,0,0,114,41,0, - 0,0,114,48,0,0,0,114,31,0,0,0,114,32,0,0, - 0,114,53,0,0,0,114,54,0,0,0,114,56,0,0,0, - 114,63,0,0,0,114,65,0,0,0,114,75,0,0,0,114, - 81,0,0,0,114,84,0,0,0,114,90,0,0,0,114,101, - 0,0,0,114,102,0,0,0,114,106,0,0,0,114,85,0, - 0,0,218,6,111,98,106,101,99,116,90,9,95,80,79,80, - 85,76,65,84,69,114,132,0,0,0,114,137,0,0,0,114, - 144,0,0,0,114,97,0,0,0,114,86,0,0,0,114,148, - 0,0,0,114,149,0,0,0,114,87,0,0,0,114,150,0, - 0,0,114,160,0,0,0,114,165,0,0,0,114,171,0,0, - 0,114,173,0,0,0,114,176,0,0,0,114,181,0,0,0, - 114,191,0,0,0,114,182,0,0,0,114,184,0,0,0,114, - 185,0,0,0,114,186,0,0,0,114,194,0,0,0,114,196, - 0,0,0,114,199,0,0,0,114,200,0,0,0,114,204,0, - 0,0,114,206,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,218,8,60,109,111, - 100,117,108,101,62,8,0,0,0,115,96,0,0,0,6,17, - 6,2,12,8,12,4,19,20,6,2,6,3,22,4,19,68, - 19,21,19,19,12,19,12,19,12,11,18,8,12,11,12,12, - 12,16,12,36,19,27,19,101,24,26,9,3,18,45,18,60, - 12,18,12,17,12,25,12,29,12,23,12,16,19,73,19,77, - 19,13,12,9,12,9,15,40,12,17,6,1,10,2,12,27, - 12,6,18,24,12,32,12,15,24,35,12,7,12,47, + 0,0,218,17,95,99,97,108,99,95,95,95,112,97,99,107, + 97,103,101,95,95,4,4,0,0,115,22,0,0,0,0,7, + 15,1,21,1,7,1,15,1,12,1,9,2,7,1,10,1, + 12,1,19,1,114,196,0,0,0,99,5,0,0,0,0,0, + 0,0,9,0,0,0,5,0,0,0,67,0,0,0,115,227, + 0,0,0,124,4,0,100,1,0,107,2,0,114,27,0,116, + 0,0,124,0,0,131,1,0,125,5,0,110,54,0,124,1, + 0,100,2,0,107,9,0,114,45,0,124,1,0,110,3,0, + 105,0,0,125,6,0,116,1,0,124,6,0,131,1,0,125, + 7,0,116,0,0,124,0,0,124,7,0,124,4,0,131,3, + 0,125,5,0,124,3,0,115,207,0,124,4,0,100,1,0, + 107,2,0,114,122,0,116,0,0,124,0,0,106,2,0,100, + 3,0,131,1,0,100,1,0,25,131,1,0,83,124,0,0, + 115,132,0,124,5,0,83,116,3,0,124,0,0,131,1,0, + 116,3,0,124,0,0,106,2,0,100,3,0,131,1,0,100, + 1,0,25,131,1,0,24,125,8,0,116,4,0,106,5,0, + 124,5,0,106,6,0,100,2,0,116,3,0,124,5,0,106, + 6,0,131,1,0,124,8,0,24,133,2,0,25,25,83,110, + 16,0,116,7,0,124,5,0,124,3,0,116,0,0,131,3, + 0,83,100,2,0,83,41,4,97,214,1,0,0,73,109,112, + 111,114,116,32,97,32,109,111,100,117,108,101,46,10,10,32, + 32,32,32,84,104,101,32,39,103,108,111,98,97,108,115,39, + 32,97,114,103,117,109,101,110,116,32,105,115,32,117,115,101, + 100,32,116,111,32,105,110,102,101,114,32,119,104,101,114,101, + 32,116,104,101,32,105,109,112,111,114,116,32,105,115,32,111, + 99,99,117,114,105,110,103,32,102,114,111,109,10,32,32,32, + 32,116,111,32,104,97,110,100,108,101,32,114,101,108,97,116, + 105,118,101,32,105,109,112,111,114,116,115,46,32,84,104,101, + 32,39,108,111,99,97,108,115,39,32,97,114,103,117,109,101, + 110,116,32,105,115,32,105,103,110,111,114,101,100,46,32,84, + 104,101,10,32,32,32,32,39,102,114,111,109,108,105,115,116, + 39,32,97,114,103,117,109,101,110,116,32,115,112,101,99,105, + 102,105,101,115,32,119,104,97,116,32,115,104,111,117,108,100, + 32,101,120,105,115,116,32,97,115,32,97,116,116,114,105,98, + 117,116,101,115,32,111,110,32,116,104,101,32,109,111,100,117, + 108,101,10,32,32,32,32,98,101,105,110,103,32,105,109,112, + 111,114,116,101,100,32,40,101,46,103,46,32,96,96,102,114, + 111,109,32,109,111,100,117,108,101,32,105,109,112,111,114,116, + 32,60,102,114,111,109,108,105,115,116,62,96,96,41,46,32, + 32,84,104,101,32,39,108,101,118,101,108,39,10,32,32,32, + 32,97,114,103,117,109,101,110,116,32,114,101,112,114,101,115, + 101,110,116,115,32,116,104,101,32,112,97,99,107,97,103,101, + 32,108,111,99,97,116,105,111,110,32,116,111,32,105,109,112, + 111,114,116,32,102,114,111,109,32,105,110,32,97,32,114,101, + 108,97,116,105,118,101,10,32,32,32,32,105,109,112,111,114, + 116,32,40,101,46,103,46,32,96,96,102,114,111,109,32,46, + 46,112,107,103,32,105,109,112,111,114,116,32,109,111,100,96, + 96,32,119,111,117,108,100,32,104,97,118,101,32,97,32,39, + 108,101,118,101,108,39,32,111,102,32,50,41,46,10,10,32, + 32,32,32,114,33,0,0,0,78,114,121,0,0,0,41,8, + 114,186,0,0,0,114,196,0,0,0,218,9,112,97,114,116, + 105,116,105,111,110,114,167,0,0,0,114,14,0,0,0,114, + 21,0,0,0,114,1,0,0,0,114,194,0,0,0,41,9, + 114,15,0,0,0,114,195,0,0,0,218,6,108,111,99,97, + 108,115,114,192,0,0,0,114,170,0,0,0,114,89,0,0, + 0,90,8,103,108,111,98,97,108,115,95,114,169,0,0,0, + 90,7,99,117,116,95,111,102,102,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,218,10,95,95,105,109,112,111, + 114,116,95,95,25,4,0,0,115,26,0,0,0,0,11,12, + 1,15,2,24,1,12,1,18,1,6,3,12,1,23,1,6, + 1,4,4,35,3,40,2,114,199,0,0,0,99,1,0,0, + 0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0, + 0,115,53,0,0,0,116,0,0,106,1,0,124,0,0,131, + 1,0,125,1,0,124,1,0,100,0,0,107,8,0,114,43, + 0,116,2,0,100,1,0,124,0,0,23,131,1,0,130,1, + 0,116,3,0,124,1,0,131,1,0,83,41,2,78,122,25, + 110,111,32,98,117,105,108,116,45,105,110,32,109,111,100,117, + 108,101,32,110,97,109,101,100,32,41,4,114,150,0,0,0, + 114,154,0,0,0,114,77,0,0,0,114,149,0,0,0,41, + 2,114,15,0,0,0,114,88,0,0,0,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,218,18,95,98,117,105, + 108,116,105,110,95,102,114,111,109,95,110,97,109,101,60,4, + 0,0,115,8,0,0,0,0,1,15,1,12,1,16,1,114, + 200,0,0,0,99,2,0,0,0,0,0,0,0,12,0,0, + 0,12,0,0,0,67,0,0,0,115,74,1,0,0,124,1, + 0,97,0,0,124,0,0,97,1,0,116,2,0,116,1,0, + 131,1,0,125,2,0,120,123,0,116,1,0,106,3,0,106, + 4,0,131,0,0,68,93,106,0,92,2,0,125,3,0,125, + 4,0,116,5,0,124,4,0,124,2,0,131,2,0,114,40, + 0,124,3,0,116,1,0,106,6,0,107,6,0,114,91,0, + 116,7,0,125,5,0,110,27,0,116,0,0,106,8,0,124, + 3,0,131,1,0,114,40,0,116,9,0,125,5,0,110,3, + 0,113,40,0,116,10,0,124,4,0,124,5,0,131,2,0, + 125,6,0,116,11,0,124,6,0,124,4,0,131,2,0,1, + 113,40,0,87,116,1,0,106,3,0,116,12,0,25,125,7, + 0,120,73,0,100,5,0,68,93,65,0,125,8,0,124,8, + 0,116,1,0,106,3,0,107,7,0,114,206,0,116,13,0, + 124,8,0,131,1,0,125,9,0,110,13,0,116,1,0,106, + 3,0,124,8,0,25,125,9,0,116,14,0,124,7,0,124, + 8,0,124,9,0,131,3,0,1,113,170,0,87,121,16,0, + 116,13,0,100,2,0,131,1,0,125,10,0,87,110,24,0, + 4,116,15,0,107,10,0,114,25,1,1,1,1,100,3,0, + 125,10,0,89,110,1,0,88,116,14,0,124,7,0,100,2, + 0,124,10,0,131,3,0,1,116,13,0,100,4,0,131,1, + 0,125,11,0,116,14,0,124,7,0,100,4,0,124,11,0, + 131,3,0,1,100,3,0,83,41,6,122,250,83,101,116,117, + 112,32,105,109,112,111,114,116,108,105,98,32,98,121,32,105, + 109,112,111,114,116,105,110,103,32,110,101,101,100,101,100,32, + 98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115, + 32,97,110,100,32,105,110,106,101,99,116,105,110,103,32,116, + 104,101,109,10,32,32,32,32,105,110,116,111,32,116,104,101, + 32,103,108,111,98,97,108,32,110,97,109,101,115,112,97,99, + 101,46,10,10,32,32,32,32,65,115,32,115,121,115,32,105, + 115,32,110,101,101,100,101,100,32,102,111,114,32,115,121,115, + 46,109,111,100,117,108,101,115,32,97,99,99,101,115,115,32, + 97,110,100,32,95,105,109,112,32,105,115,32,110,101,101,100, + 101,100,32,116,111,32,108,111,97,100,32,98,117,105,108,116, + 45,105,110,10,32,32,32,32,109,111,100,117,108,101,115,44, + 32,116,104,111,115,101,32,116,119,111,32,109,111,100,117,108, + 101,115,32,109,117,115,116,32,98,101,32,101,120,112,108,105, + 99,105,116,108,121,32,112,97,115,115,101,100,32,105,110,46, + 10,10,32,32,32,32,114,141,0,0,0,114,34,0,0,0, + 78,114,62,0,0,0,41,1,122,9,95,119,97,114,110,105, + 110,103,115,41,16,114,57,0,0,0,114,14,0,0,0,114, + 13,0,0,0,114,21,0,0,0,218,5,105,116,101,109,115, + 114,177,0,0,0,114,76,0,0,0,114,150,0,0,0,114, + 82,0,0,0,114,160,0,0,0,114,132,0,0,0,114,137, + 0,0,0,114,1,0,0,0,114,200,0,0,0,114,5,0, + 0,0,114,77,0,0,0,41,12,218,10,115,121,115,95,109, + 111,100,117,108,101,218,11,95,105,109,112,95,109,111,100,117, + 108,101,90,11,109,111,100,117,108,101,95,116,121,112,101,114, + 15,0,0,0,114,89,0,0,0,114,99,0,0,0,114,88, + 0,0,0,90,11,115,101,108,102,95,109,111,100,117,108,101, + 90,12,98,117,105,108,116,105,110,95,110,97,109,101,90,14, + 98,117,105,108,116,105,110,95,109,111,100,117,108,101,90,13, + 116,104,114,101,97,100,95,109,111,100,117,108,101,90,14,119, + 101,97,107,114,101,102,95,109,111,100,117,108,101,114,10,0, + 0,0,114,10,0,0,0,114,11,0,0,0,218,6,95,115, + 101,116,117,112,67,4,0,0,115,50,0,0,0,0,9,6, + 1,6,3,12,1,28,1,15,1,15,1,9,1,15,1,9, + 2,3,1,15,1,17,3,13,1,13,1,15,1,15,2,13, + 1,20,3,3,1,16,1,13,2,11,1,16,3,12,1,114, + 204,0,0,0,99,2,0,0,0,0,0,0,0,3,0,0, + 0,3,0,0,0,67,0,0,0,115,87,0,0,0,116,0, + 0,124,0,0,124,1,0,131,2,0,1,116,1,0,106,2, + 0,106,3,0,116,4,0,131,1,0,1,116,1,0,106,2, + 0,106,3,0,116,5,0,131,1,0,1,100,1,0,100,2, + 0,108,6,0,125,2,0,124,2,0,97,7,0,124,2,0, + 106,8,0,116,1,0,106,9,0,116,10,0,25,131,1,0, + 1,100,2,0,83,41,3,122,50,73,110,115,116,97,108,108, + 32,105,109,112,111,114,116,108,105,98,32,97,115,32,116,104, + 101,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110, + 32,111,102,32,105,109,112,111,114,116,46,114,33,0,0,0, + 78,41,11,114,204,0,0,0,114,14,0,0,0,114,174,0, + 0,0,114,113,0,0,0,114,150,0,0,0,114,160,0,0, + 0,218,26,95,102,114,111,122,101,110,95,105,109,112,111,114, + 116,108,105,98,95,101,120,116,101,114,110,97,108,114,119,0, + 0,0,218,8,95,105,110,115,116,97,108,108,114,21,0,0, + 0,114,1,0,0,0,41,3,114,202,0,0,0,114,203,0, + 0,0,114,205,0,0,0,114,10,0,0,0,114,10,0,0, + 0,114,11,0,0,0,114,206,0,0,0,114,4,0,0,115, + 12,0,0,0,0,2,13,2,16,1,16,3,12,1,6,1, + 114,206,0,0,0,41,51,114,3,0,0,0,114,119,0,0, + 0,114,12,0,0,0,114,16,0,0,0,114,17,0,0,0, + 114,59,0,0,0,114,41,0,0,0,114,48,0,0,0,114, + 31,0,0,0,114,32,0,0,0,114,53,0,0,0,114,54, + 0,0,0,114,56,0,0,0,114,63,0,0,0,114,65,0, + 0,0,114,75,0,0,0,114,81,0,0,0,114,84,0,0, + 0,114,90,0,0,0,114,101,0,0,0,114,102,0,0,0, + 114,106,0,0,0,114,85,0,0,0,218,6,111,98,106,101, + 99,116,90,9,95,80,79,80,85,76,65,84,69,114,132,0, + 0,0,114,137,0,0,0,114,144,0,0,0,114,97,0,0, + 0,114,86,0,0,0,114,148,0,0,0,114,149,0,0,0, + 114,87,0,0,0,114,150,0,0,0,114,160,0,0,0,114, + 165,0,0,0,114,171,0,0,0,114,173,0,0,0,114,176, + 0,0,0,114,181,0,0,0,114,191,0,0,0,114,182,0, + 0,0,114,184,0,0,0,114,185,0,0,0,114,186,0,0, + 0,114,194,0,0,0,114,196,0,0,0,114,199,0,0,0, + 114,200,0,0,0,114,204,0,0,0,114,206,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, + 0,0,0,218,8,60,109,111,100,117,108,101,62,8,0,0, + 0,115,96,0,0,0,6,17,6,2,12,8,12,4,19,20, + 6,2,6,3,22,4,19,68,19,21,19,19,12,19,12,19, + 12,11,18,8,12,11,12,12,12,16,12,36,19,27,19,101, + 24,26,9,3,18,45,18,60,12,18,12,17,12,25,12,29, + 12,23,12,16,19,73,19,77,19,13,12,9,12,9,15,40, + 12,17,6,1,10,2,12,27,12,6,18,24,12,32,12,21, + 24,35,12,7,12,47, };