equal
deleted
inserted
replaced
41 raise KeyError(name) |
41 raise KeyError(name) |
42 return mod |
42 return mod |
43 |
43 |
44 def loadpath(path, module_name): |
44 def loadpath(path, module_name): |
45 module_name = module_name.replace('.', '_') |
45 module_name = module_name.replace('.', '_') |
46 path = util.expandpath(path) |
46 path = util.normpath(util.expandpath(path)) |
47 if os.path.isdir(path): |
47 if os.path.isdir(path): |
48 # module/__init__.py style |
48 # module/__init__.py style |
49 d, f = os.path.split(path.rstrip('/')) |
49 d, f = os.path.split(path) |
50 fd, fpath, desc = imp.find_module(f, [d]) |
50 fd, fpath, desc = imp.find_module(f, [d]) |
51 return imp.load_module(module_name, fd, fpath, desc) |
51 return imp.load_module(module_name, fd, fpath, desc) |
52 else: |
52 else: |
53 try: |
53 try: |
54 return imp.load_source(module_name, path) |
54 return imp.load_source(module_name, path) |