← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

[merge] jam-integration 1490

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
50
50
        log_exception_quietly
51
51
from bzrlib.errors import BzrError
52
52
from bzrlib import plugins
 
53
from bzrlib.osutils import pathjoin
53
54
 
54
 
DEFAULT_PLUGIN_PATH = os.path.join(config_dir(), 'plugins')
 
55
DEFAULT_PLUGIN_PATH = pathjoin(config_dir(), 'plugins')
55
56
 
56
57
_loaded = False
57
58
 
115
116
        if not os.path.isdir(d):
116
117
            continue
117
118
        for f in os.listdir(d):
118
 
            path = os.path.join(d, f)
 
119
            path = pathjoin(d, f)
119
120
            if os.path.isdir(path):
120
121
                for entry in package_entries:
121
122
                    # This directory should be a package, and thus added to
122
123
                    # the list
123
 
                    if os.path.isfile(os.path.join(path, entry)):
 
124
                    if os.path.isfile(pathjoin(path, entry)):
124
125
                        break
125
126
                else: # This directory is not a package
126
127
                    continue