← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugin.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:11:25 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201171125-5e1f0970246c4925
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugin.py
49
49
        log_exception_quietly
50
50
from bzrlib.errors import BzrError
51
51
from bzrlib import plugins
 
52
from bzrlib.osutils import pathjoin
52
53
 
53
 
DEFAULT_PLUGIN_PATH = os.path.join(config_dir(), 'plugins')
 
54
DEFAULT_PLUGIN_PATH = pathjoin(config_dir(), 'plugins')
54
55
 
55
56
all_plugins = []
56
57
_loaded = False
100
101
        if not os.path.isdir(d):
101
102
            continue
102
103
        for f in os.listdir(d):
103
 
            path = os.path.join(d, f)
 
104
            path = pathjoin(d, f)
104
105
            if os.path.isdir(path):
105
106
                for entry in package_entries:
106
107
                    # This directory should be a package, and thus added to
107
108
                    # the list
108
 
                    if os.path.isfile(os.path.join(path, entry)):
 
109
                    if os.path.isfile(pathjoin(path, entry)):
109
110
                        break
110
111
                else: # This directory is not a package
111
112
                    continue