~beeseek-devs/beeseek/1.0

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Andrea Corbellini
  • Date: 2010-03-02 17:55:21 UTC
  • mfrom: (455.1.5 optrename)
  • Revision ID: andrea.corbellini@beeseek.org-20100302175521-yrpsviq9zr80rhqk
Rename options to be PEP-8 compilant.

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
    def get_directories(self):
37
37
        if os.name == 'nt':
38
38
            dir_names = dict(
39
 
                configdir='BeeSeek/config',
40
 
                datadir='BeeSeek/database',
41
 
                safedir='BeeSeek/safe',
42
 
                templatesdir='BeeSeek/templates',
 
39
                config_dir='BeeSeek/config',
 
40
                data_dir='BeeSeek/database',
 
41
                safe_dir='BeeSeek/safe',
 
42
                templates_dir='BeeSeek/templates',
43
43
                )
44
44
        else:
45
45
            dir_names = dict(
46
 
                configdir = 'etc/beeseek',
47
 
                datadir = 'var/lib/beeseek/database',
48
 
                safedir = 'var/lib/beeseek/safe',
49
 
                templatesdir = 'usr/share/beeseek/templates',
 
46
                config_dir = 'etc/beeseek',
 
47
                data_dir = 'var/lib/beeseek/database',
 
48
                safe_dir = 'var/lib/beeseek/safe',
 
49
                templates_dir = 'usr/share/beeseek/templates',
50
50
                )
51
51
            install = self.distribution.get_command_obj('install')
52
52
            if install.root:
56
56
            dir_names[key] = os.path.join(self.install_dir, value)
57
57
 
58
58
        dirs_map = {
59
 
            dir_names['configdir']: 'config',
60
 
            dir_names['datadir']: 'database',
61
 
            dir_names['safedir']: 'ssl',
62
 
            dir_names['templatesdir']: 'templates',
 
59
            dir_names['config_dir']: 'config',
 
60
            dir_names['data_dir']: 'database',
 
61
            dir_names['safe_dir']: 'ssl',
 
62
            dir_names['templates_dir']: 'templates',
63
63
            }
64
64
 
65
65
        return dir_names, dirs_map
83
83
        if not self.dry_run and pwd:
84
84
            items = pwd.getpwnam('www-data')
85
85
            uid, gid = items[2], items[3]
86
 
            for path in ('datadir', 'safedir'):
 
86
            for path in ('data_dir', 'safe_dir'):
87
87
                path = dir_names[path]
88
88
                for directory, subdirs, subfiles in os.walk(path):
89
89
                    try: