diff options
Diffstat (limited to 'dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch')
| -rw-r--r-- | dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch b/dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch new file mode 100644 index 000000000000..117cb8563b77 --- /dev/null +++ b/dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch @@ -0,0 +1,120 @@ +From: Ole Streicher <olebole@debian.org> +Date: Thu, 12 Jan 2017 11:37:47 +0100 +Subject: Use external python modules instead of convenience copies +bicatali@gentoo.org: Edit to remove jsviewer debian internals + +--- + astropy/coordinates/angle_utilities.py | 2 +- + astropy/extern/configobj.py | 5 ++++- + astropy/extern/six.py | 2 +- + astropy/units/format/cds.py | 4 ++-- + astropy/units/format/generic.py | 4 ++-- + astropy/units/format/ogip.py | 4 ++-- + 8 files changed, 23 insertions(+), 18 deletions(-) + +diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py +index cfa894e..bb8fb7d 100644 +--- a/astropy/coordinates/angle_utilities.py ++++ b/astropy/coordinates/angle_utilities.py +@@ -64,7 +64,7 @@ class _AngleParser(object): + + @classmethod + def _make_parser(cls): +- from ..extern.ply import lex, yacc ++ from ply import lex, yacc + + # List of token names. + tokens = ( +diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py +index 8d1bd8c..e3bb0e0 100644 +--- a/astropy/extern/configobj.py ++++ b/astropy/extern/configobj.py +@@ -7,5 +7,8 @@ currently installed version of python. + Also, this should actually never actually show up as a docstring, because + it should get overwritten by the appropriate configobj docstring. + """ ++from __future__ import absolute_import ++import validate ++import configobj ++ + +-from .configobj import configobj, validate, __doc__ +diff --git a/astropy/extern/six.py b/astropy/extern/six.py +index 5398fc0..fb3a30c 100644 +--- a/astropy/extern/six.py ++++ b/astropy/extern/six.py +@@ -13,7 +13,7 @@ _SIX_MIN_VERSION = StrictVersion('1.10.0') + # Update this to prevent Astropy from using its bundled copy of six + # (but only if some other version of at least _SIX_MIN_VERSION can + # be provided) +-_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six'] ++_SIX_SEARCH_PATH = ['six'] + + + def _find_module(name, path=None): +diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py +index e40c1cf..0d5e033 100644 +--- a/astropy/units/format/cds.py ++++ b/astropy/units/format/cds.py +@@ -78,7 +78,7 @@ class CDS(Base): + + @classmethod + def _make_lexer(cls): +- from ...extern.ply import lex ++ from ply import lex + + tokens = cls._tokens + +@@ -142,7 +142,7 @@ class CDS(Base): + <https://bitbucket.org/nxg/unity/>`_. + """ + +- from ...extern.ply import yacc ++ from ply import yacc + + tokens = cls._tokens + +diff --git a/astropy/units/format/generic.py b/astropy/units/format/generic.py +index 974ca25..7d40dfe 100644 +--- a/astropy/units/format/generic.py ++++ b/astropy/units/format/generic.py +@@ -103,7 +103,7 @@ class Generic(Base): + + @classmethod + def _make_lexer(cls): +- from ...extern.ply import lex ++ from ply import lex + + tokens = cls._tokens + +@@ -178,7 +178,7 @@ class Generic(Base): + formats, the only difference being the set of available unit + strings. + """ +- from ...extern.ply import yacc ++ from ply import yacc + + tokens = cls._tokens + +diff --git a/astropy/units/format/ogip.py b/astropy/units/format/ogip.py +index e429407..e80e35a 100644 +--- a/astropy/units/format/ogip.py ++++ b/astropy/units/format/ogip.py +@@ -110,7 +110,7 @@ class OGIP(generic.Generic): + + @classmethod + def _make_lexer(cls): +- from ...extern.ply import lex ++ from ply import lex + + tokens = cls._tokens + +@@ -180,7 +180,7 @@ class OGIP(generic.Generic): + <https://bitbucket.org/nxg/unity/>`_. + """ + +- from ...extern.ply import yacc ++ from ply import yacc + + tokens = cls._tokens + |