Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Make Hy a Python-source module type

Browse Source
This commit is contained in:
Brandon T. Willard 2018-08-26 12:10:40 -05:00
parent 32033b03ce
commit 2ea1e8e017
1 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
hy/importer.py
View File

@ -242,18 +242,15 @@ else:
from pkgutil import ImpImporter, ImpLoader from pkgutil import ImpImporter, ImpLoader
# 100x better!
HY_SOURCE = imp.PY_SOURCE * 100
class HyLoader(ImpLoader, object): class HyLoader(ImpLoader, object):
def __init__(self, fullname, filename, fileobj=None, etc=None): def __init__(self, fullname, filename, fileobj=None, etc=None):
"""This constructor is designed for some compatibility with """This constructor is designed for some compatibility with
SourceFileLoader.""" SourceFileLoader."""
if etc is None and filename is not None: if etc is None and filename is not None:
if filename.endswith('.hy'): if filename.endswith('.hy'):
etc = ('.hy', 'U', HY_SOURCE) etc = ('.hy', 'U', imp.PY_SOURCE)
if fileobj is None: if fileobj is None:
fileobj = open(filename, 'rU') fileobj = io.open(filename, 'rU', encoding='utf-8')
super(HyLoader, self).__init__(fullname, fileobj, filename, etc) super(HyLoader, self).__init__(fullname, fileobj, filename, etc)
@ -266,10 +263,11 @@ else:
"""Same as `pkgutil.ImpLoader`, with an extra check for Hy """Same as `pkgutil.ImpLoader`, with an extra check for Hy
source""" source"""
fullname = self._fix_name(fullname) fullname = self._fix_name(fullname)
ext_type = self.etc[0]
mod_type = self.etc[2] mod_type = self.etc[2]
mod = None mod = None
pkg_path = os.path.join(self.filename, '__init__.hy') pkg_path = os.path.join(self.filename, '__init__.hy')
if mod_type == HY_SOURCE or ( if ext_type == '.hy' or (
mod_type == imp.PKG_DIRECTORY and mod_type == imp.PKG_DIRECTORY and
os.path.isfile(pkg_path)): os.path.isfile(pkg_path)):
@ -309,13 +307,13 @@ else:
def _reopen(self): def _reopen(self):
"""Same as `pkgutil.ImpLoader`, with an extra check for Hy """Same as `pkgutil.ImpLoader`, with an extra check for Hy
source""" source"""
if self.file and self.file.closed:
ext_type = self.etc[0]
if ext_type == '.hy':
self.file = io.open(self.filename, 'rU', encoding='utf-8')
else:
super(HyLoader, self)._reopen() super(HyLoader, self)._reopen()
# Add the Hy case...
if self.file and self.file.closed:
mod_type = self.etc[2]
if mod_type == HY_SOURCE:
self.file = io.open(self.filename, 'rU', encoding='utf-8')
def byte_compile_hy(self, fullname=None): def byte_compile_hy(self, fullname=None):
fullname = self._fix_name(fullname) fullname = self._fix_name(fullname)
@ -344,8 +342,8 @@ else:
"""Same as `pkgutil.ImpLoader`, with an extra check for Hy """Same as `pkgutil.ImpLoader`, with an extra check for Hy
source""" source"""
fullname = self._fix_name(fullname) fullname = self._fix_name(fullname)
mod_type = self.etc[2] ext_type = self.etc[0]
if mod_type == HY_SOURCE: if ext_type == '.hy':
# Looks like we have to manually check for--and update-- # Looks like we have to manually check for--and update--
# the bytecode. # the bytecode.
t_py = long(os.stat(self.filename).st_mtime) t_py = long(os.stat(self.filename).st_mtime)
@ -370,40 +368,10 @@ else:
return self.code return self.code
def get_source(self, fullname=None):
"""Same as `pkgutil.ImpLoader`, with an extra check for Hy
source"""
fullname = self._fix_name(fullname)
mod_type = self.etc[2]
if self.source is None and mod_type == HY_SOURCE:
self._reopen()
try:
self.source = self.file.read()
finally:
self.file.close()
if self.source is None:
super(HyLoader, self).get_source(fullname=fullname)
return self.source
def get_filename(self, fullname=None):
"""Same as `pkgutil.ImpLoader`, with an extra check for Hy
source"""
fullname = self._fix_name(fullname)
if self.etc[2] == HY_SOURCE:
return self.filename
if self.filename is None:
filename = super(HyLoader, self).get_filename(fullname=fullname)
return filename
def _get_delegate(self): def _get_delegate(self):
return HyImporter(self.filename).find_module('__init__') return HyImporter(self.filename).find_module('__init__')
class HyImporter(ImpImporter, object): class HyImporter(ImpImporter, object):
def __init__(self, path=None): def __init__(self, path=None):
# We need to be strict about the types of files this importer will # We need to be strict about the types of files this importer will
# handle. To start, if the path is not the current directory in # handle. To start, if the path is not the current directory in
@ -444,7 +412,7 @@ else:
entry.endswith('.hy')): entry.endswith('.hy')):
file_path = entry file_path = entry
fileobj = io.open(file_path, 'rU', encoding='utf-8') fileobj = io.open(file_path, 'rU', encoding='utf-8')
etc = ('.hy', 'U', HY_SOURCE) etc = ('.hy', 'U', imp.PY_SOURCE)
break break
else: else:
file_path = os.path.join(entry, subname) file_path = os.path.join(entry, subname)
@ -457,7 +425,7 @@ else:
file_path = file_path + '.hy' file_path = file_path + '.hy'
if os.path.isfile(file_path): if os.path.isfile(file_path):
fileobj = io.open(file_path, 'rU', encoding='utf-8') fileobj = io.open(file_path, 'rU', encoding='utf-8')
etc = ('.hy', 'U', HY_SOURCE) etc = ('.hy', 'U', imp.PY_SOURCE)
break break
else: else:
try: try:
@ -465,7 +433,6 @@ else:
except (ImportError, IOError): except (ImportError, IOError):
return None return None
return HyLoader(fullname, file_path, fileobj, etc) return HyLoader(fullname, file_path, fileobj, etc)
sys.path_hooks.append(HyImporter) sys.path_hooks.append(HyImporter)