class REPO:
    '''Repo attributes'''
    TYPE = 'type'

    DIRECTORY = 'directory'
    VOLATILE = 'volatile'
    SERVE_INTERFACE = 'serve_interface'
    SERVE_PORT = 'serve_port'
    SERVE_USERNAME = 'serve_username'
    SERVE_PASSWORD = 'serve_password'

    USERNAME = 'username'
    PASSWORD = 'password'
    DOWNLOAD_URL = 'download_url'
    UPLOAD_URL = 'upload_url'


class REPOTYPE:
    '''Values for REPO.TYPE'''
    DIRECTORY = 'directory'
    HTTP = 'http'

class REPO:
    '''Repo attributes'''
    TYPE = 'type'

    DIRECTORY = 'directory'
    VOLATILE = 'volatile'
    SERVE_INTERFACE = 'interface'
    SERVE_PORT = 'port'
    SERVE_USERNAME = 'username'
    SERVE_PASSWORD = 'password'

    USERNAME = 'username'
    PASSWORD = 'password'
    DOWNLOAD_URL = 'download_url'
    UPLOAD_URL = 'upload_url'


class REPOTYPE:
    '''Values for REPO.TYPE'''
    DIRECTORY = 'directory'
    HTTP = 'http'

Revert "make REPO.SERVE_* attributes distinct from other attributes (username, password)"
Revert "make REPO.SERVE_* attributes distinct from other attributes (username, password)"

This reverts commit 1553f4bae5f315666fac5ad9f6600ba8b076a84b.
