Fix docs.

[pithos] / pithos / lib / util.py

diff --git a/pithos/lib/util.py b/pithos/lib/util.py
index 905b9d0..74adc49 100644 (file)
--- a/pithos/lib/util.py
+++ b/pithos/lib/util.py
@@ -1,4 +1,4 @@
-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -33,10 +33,9 @@
 
 import os
 
-DEFAULT_SERVER = 'plus.pithos.grnet.gr'
-DEFAULT_API = 'v1'
+DEFAULT_URL = 'https://plus.pithos.grnet.gr/v1'
 DEFAULT_USER = 'test'
-DEFAULT_AUTH = '0000'
+DEFAULT_TOKEN = '0000'
 
 def get_user():
     try:
@@ -46,18 +45,12 @@ def get_user():
 
 def get_auth():
     try:
-        return os.environ['PITHOS_AUTH']
+        return os.environ['PITHOS_TOKEN']
     except KeyError:
-        return DEFAULT_AUTH
+        return DEFAULT_TOKEN
 
-def get_server():
+def get_url():
     try:
-        return os.environ['PITHOS_SERVER']
+        return os.environ['PITHOS_URL']
     except KeyError:
-        return DEFAULT_SERVER
-
-def get_api():
-    try:
-        return os.environ['PITHOS_API']
-    except KeyError:
-        return DEFAULT_API
+        return DEFAULT_URL