import sys
import psycopg2
import os
import yaml

if 'CATMAID_CONFIGURATION' in os.environ:
    path = os.environ['CATMAID_CONFIGURATION']
else:
    path = os.path.join(os.environ['HOME'], '.catmaid-db')

try:
    conf = yaml.load(open(path))
except:
    print >> sys.stderr, '''Your %s file should look like:

host: localhost
port: 5432
database: catmaid
username: catmaid_user
password: password_of_your_catmaid_user''' % (path,)
    sys.exit(1)

# Make a variable for each of these so that they can be imported:
db_host = conf['host']
db_port = conf['port']
db_database = conf['database']
db_username = conf['username']
db_password = conf['password']

db_connection = psycopg2.connect(host=db_host,
                                 port=db_port,
                                 database=db_database,
                                 user=db_username,
                                 password=db_password)

import sys
import psycopg2
import os
import yaml

if 'CATMAID_CONFIGURATION' in os.environ:
    path = os.environ['CATMAID_CONFIGURATION']
else:
    path = os.path.join(os.environ['HOME'], '.catmaid-db')

try:
    conf = yaml.load(open(path))
except:
    print >> sys.stderr, '''Your %s file should look like:

host: localhost
port: 5432
database: catmaid
username: catmaid_user
password: password_of_your_catmaid_user''' % (path,)
    sys.exit(1)

# Make a variable for each of these so that they can be imported:
db_host = conf['host']
db_port = conf['port'] if 'port' in conf else 5432
db_database = conf['database']
db_username = conf['username']
db_password = conf['password']

db_connection = psycopg2.connect(host=db_host,
                                 port=db_port,
                                 database=db_database,
                                 user=db_username,
                                 password=db_password)

Add default port to database connection script
Add default port to database connection script

The default port is used if the ~/.catmaid-db file doesn't contain it. This
fixes #454.

  import sys
  import psycopg2
  import os
  import yaml
  
  if 'CATMAID_CONFIGURATION' in os.environ:
      path = os.environ['CATMAID_CONFIGURATION']
  else:
      path = os.path.join(os.environ['HOME'], '.catmaid-db')
  
  try:
      conf = yaml.load(open(path))
  except:
      print >> sys.stderr, '''Your %s file should look like:
  
  host: localhost
  port: 5432
  database: catmaid
  username: catmaid_user
  password: password_of_your_catmaid_user''' % (path,)
      sys.exit(1)
  
  # Make a variable for each of these so that they can be imported:
  db_host = conf['host']
- db_port = conf['port']
+ db_port = conf['port'] if 'port' in conf else 5432
  db_database = conf['database']
  db_username = conf['username']
  db_password = conf['password']
  
  db_connection = psycopg2.connect(host=db_host,
                                   port=db_port,
                                   database=db_database,
                                   user=db_username,
                                   password=db_password)
  
Add default port to database connection script
## Code Before:
import sys
import psycopg2
import os
import yaml

if 'CATMAID_CONFIGURATION' in os.environ:
    path = os.environ['CATMAID_CONFIGURATION']
else:
    path = os.path.join(os.environ['HOME'], '.catmaid-db')

try:
    conf = yaml.load(open(path))
except:
    print >> sys.stderr, '''Your %s file should look like:

host: localhost
port: 5432
database: catmaid
username: catmaid_user
password: password_of_your_catmaid_user''' % (path,)
    sys.exit(1)

# Make a variable for each of these so that they can be imported:
db_host = conf['host']
db_port = conf['port']
db_database = conf['database']
db_username = conf['username']
db_password = conf['password']

db_connection = psycopg2.connect(host=db_host,
                                 port=db_port,
                                 database=db_database,
                                 user=db_username,
                                 password=db_password)

## Instruction:
Add default port to database connection script
## Code After:
import sys
import psycopg2
import os
import yaml

if 'CATMAID_CONFIGURATION' in os.environ:
    path = os.environ['CATMAID_CONFIGURATION']
else:
    path = os.path.join(os.environ['HOME'], '.catmaid-db')

try:
    conf = yaml.load(open(path))
except:
    print >> sys.stderr, '''Your %s file should look like:

host: localhost
port: 5432
database: catmaid
username: catmaid_user
password: password_of_your_catmaid_user''' % (path,)
    sys.exit(1)

# Make a variable for each of these so that they can be imported:
db_host = conf['host']
db_port = conf['port'] if 'port' in conf else 5432
db_database = conf['database']
db_username = conf['username']
db_password = conf['password']

db_connection = psycopg2.connect(host=db_host,
                                 port=db_port,
                                 database=db_database,
                                 user=db_username,
                                 password=db_password)
