Revert to previous way of setting 'authenticate'

This reverts commit a055f97a342f670171f30095cabfd4ba1bfdad17.
This reverts commit 4cec5250a3f9058fea5af5ef432a5b230ca94963.
import os

mylang = 'test'
family = 'wikipedia'


custom_path = os.path.expanduser('~/user-config.py')
if os.path.exists(custom_path):
    with open(custom_path, 'rb') as f:
        exec(compile(f.read(), custom_path, 'exec'), globals())

    del f
# Clean up temp variables, since pwb issues a warning otherwise
# to help people catch misspelt config
del custom_path

# Things that should be non-easily-overridable
for fam in (
        'wikipedia', 'commons', 'meta', 'wikiboots', 'wikimedia',
        'wikiquote', 'wikisource', 'wikisource', 'wiktionary', 'wikiversity',
        'wikidata', 'mediawiki'
):
    usernames[fam]['*'] = os.environ['USER']

del fam

# If OAuth integration is available, take it
if 'CLIENT_ID' in os.environ:
    authenticate['*'] = (
        os.environ['CLIENT_ID'],
        os.environ['CLIENT_SECRET'],
        os.environ['ACCESS_KEY'],
        os.environ['ACCESS_SECRET']
    )

import os

mylang = 'test'
family = 'wikipedia'


custom_path = os.path.expanduser('~/user-config.py')
if os.path.exists(custom_path):
    with open(custom_path, 'rb') as f:
        exec(compile(f.read(), custom_path, 'exec'), globals())

    del f
# Clean up temp variables, since pwb issues a warning otherwise
# to help people catch misspelt config
del custom_path

# Things that should be non-easily-overridable
for fam in (
        'wikipedia', 'commons', 'meta', 'wikiboots', 'wikimedia',
        'wikiquote', 'wikisource', 'wikisource', 'wiktionary', 'wikiversity',
        'wikidata', 'mediawiki'
):

    usernames[fam]['*'] = os.environ['USER']
    if 'ACCESS_KEY' in os.environ:
        # If OAuth integration is available, take it
        authenticate.setdefault(fam, {})['*'] = (
            os.environ['CLIENT_ID'],
            os.environ['CLIENT_SECRET'],
            os.environ['ACCESS_KEY'],
            os.environ['ACCESS_SECRET']
        )


del fam
