Mercurial > hg > hg-fastimport
changeset 88:2fc99e3479d9
python-fastimport: Import our own modules using relative pathing
This allows python-fastimport to be embedded as vendor code within
other modules.
This patch has been accepted upstream.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Tue, 19 Jan 2021 23:00:01 +0000 |
| parents | 51664f5abc3a |
| children | e6602cc471d5 |
| files | hgext3rd/fastimport/vendor/python_fastimport/commands.py hgext3rd/fastimport/vendor/python_fastimport/dates.py hgext3rd/fastimport/vendor/python_fastimport/parser.py hgext3rd/fastimport/vendor/python_fastimport/processor.py hgext3rd/fastimport/vendor/python_fastimport/processors/filter_processor.py hgext3rd/fastimport/vendor/python_fastimport/processors/info_processor.py hgext3rd/fastimport/vendor/python_fastimport/processors/query_processor.py |
| diffstat | 7 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/fastimport/vendor/python_fastimport/commands.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/commands.py Tue Jan 19 23:00:01 2021 +0000 @@ -24,7 +24,7 @@ import stat import sys -from fastimport.helpers import ( +from .helpers import ( newobject as object, utf8_bytes_string, repr_bytes,
--- a/hgext3rd/fastimport/vendor/python_fastimport/dates.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/dates.py Tue Jan 19 23:00:01 2021 +0000 @@ -24,7 +24,7 @@ """ import time -from fastimport import errors +from . import errors def parse_raw(s, lineno=0):
--- a/hgext3rd/fastimport/vendor/python_fastimport/parser.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/parser.py Tue Jan 19 23:00:01 2021 +0000 @@ -164,12 +164,12 @@ import sys import codecs -from fastimport import ( +from . import ( commands, dates, errors, ) -from fastimport.helpers import ( +from .helpers import ( newobject as object, utf8_bytes_string, )
--- a/hgext3rd/fastimport/vendor/python_fastimport/processor.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/processor.py Tue Jan 19 23:00:01 2021 +0000 @@ -32,8 +32,8 @@ import sys import time -from fastimport import errors -from fastimport.helpers import newobject as object +from . import errors +from .helpers import newobject as object class ImportProcessor(object):
--- a/hgext3rd/fastimport/vendor/python_fastimport/processors/filter_processor.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/processors/filter_processor.py Tue Jan 19 23:00:01 2021 +0000 @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. """Import processor that filters the input (and doesn't import).""" -from fastimport import ( +from .. import ( commands, helpers, processor,
--- a/hgext3rd/fastimport/vendor/python_fastimport/processors/info_processor.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/processors/info_processor.py Tue Jan 19 23:00:01 2021 +0000 @@ -18,16 +18,14 @@ from __future__ import absolute_import from .. import ( + commands, + processor, reftracker, ) from ..helpers import ( invert_dict, invert_dictset, ) -from fastimport import ( - commands, - processor, - ) import stat
--- a/hgext3rd/fastimport/vendor/python_fastimport/processors/query_processor.py Tue Jan 19 22:57:27 2021 +0000 +++ b/hgext3rd/fastimport/vendor/python_fastimport/processors/query_processor.py Tue Jan 19 23:00:01 2021 +0000 @@ -17,7 +17,7 @@ from __future__ import print_function -from fastimport import ( +from .. import ( commands, processor, )