changed config location and filename

diff --git a/money/money.py b/money/money.py
index a61dabf8a05b829ffaa5fe78c307683eec81241a..beb4e1d088d829098842c61ea0adf03b4b1b9cb7 100755 (executable)
--- a/money/money.py
+++ b/money/money.py
@@ -6,8 +6,8 @@ import json
 
 DATA_FILE_NAME = 'dataFile'
 LAST_MOVEMENT_NUMBER = 'latestMovementsNumber'
-CONFIG_FILE_NAME = 'money-config.json'
-CONFIG_FILE_LOCATION = expanduser('~') + CONFIG_FILE_NAME
+CONFIG_FILE_NAME = 'money.conf'
+CONFIG_FILE_LOCATION = expanduser('~') + '/.config/' + CONFIG_FILE_NAME
 
 
 def scrivi_movimento(path, m):

diff --git a/money/tests/test_money.py b/money/tests/test_money.py
index 30756e678d2a3f363046d6836fa2def32d78a4ee..059149fcf7ff6762f181108f8cc1a5193d09b5d1 100644 (file)
--- a/money/tests/test_money.py
+++ b/money/tests/test_money.py
@@ -11,11 +11,11 @@ class MoneyTest(unittest.TestCase):
         self.assertTrue(True, msg='se fallisce son problemi')
 
     def test_config_file_name(self):
-        self.assertEqual(money.CONFIG_FILE_NAME, 'money-config.json')
+        self.assertEqual(money.CONFIG_FILE_NAME, 'money.conf')
 
     def test_config_file_path(self):
         self.assertEqual(money.CONFIG_FILE_LOCATION,
-                         expanduser('~') + 'money-config.json')
+                         expanduser('~') + '/.config/money.conf')
 
     def test_default_configuration(self):
         conf = money.default_configuration()