equal
deleted
inserted
replaced
31 def loadpath(path, module_name): |
31 def loadpath(path, module_name): |
32 module_name = module_name.replace('.', '_') |
32 module_name = module_name.replace('.', '_') |
33 path = os.path.expanduser(path) |
33 path = os.path.expanduser(path) |
34 if os.path.isdir(path): |
34 if os.path.isdir(path): |
35 # module/__init__.py style |
35 # module/__init__.py style |
36 d, f = os.path.split(path) |
36 d, f = os.path.split(path.rstrip('/')) |
37 fd, fpath, desc = imp.find_module(f, [d]) |
37 fd, fpath, desc = imp.find_module(f, [d]) |
38 return imp.load_module(module_name, fd, fpath, desc) |
38 return imp.load_module(module_name, fd, fpath, desc) |
39 else: |
39 else: |
40 return imp.load_source(module_name, path) |
40 return imp.load_source(module_name, path) |
41 |
41 |