new portfolio features, metal graphs, preparing for 0.4 release

[stockthis] / marketdata.py

diff --git a/marketdata.py b/marketdata.py
index 6ae332f..b77d555 100644 (file)
--- a/marketdata.py
+++ b/marketdata.py
@@ -1,5 +1,5 @@
-main = ["Markets indices", "US Markets", "European Markets", "Other Markets", "Currencies", "Exchange-Traded Funds"]
-idmain = ["indices", "usm", "eum", "om", "currency", "etf"]
+main = ["Markets indices", "US Markets", "European Markets", "Other Markets", "Currencies", "Exchange-Traded Funds", "Metal graphs"]
+idmain = ["indices", "usm", "eum", "om", "currency", "etf", "metals"]
 
 #DOW JONES
 dow_jones_symbols=['AA', 'AXP', 'BA', 'BAC', 'C', 'CAT', 'CVX', 'DD', 'DIS', 'GE', 'GM', 'HD', 'HPQ', 'IBM', 'INTC', 'JNJ', 'JPM', 'KFT', 'KO', 'MCD', 'MMM', 'MRK', 'MSFT', 'PFE', 'PG', 'T', 'UTX', 'VZ', 'WMT', 'XOM']
@@ -171,13 +171,15 @@ currency_names = ["EUR/USD", "EUR/GBP", "EUR/CHF", "EUR/SEK", "GBP/USD", "USD/JP
 etf_symbols = ["IXC", "IXN", "ICLN", "IXJ", "IXG", "IOO", "EWD", "EEM", "FXI", "BKF", "THD"]
 etf_names = ["iShares S&P Global Energy", "iShares S&P Global Technology", "iShares S&P Global Clean Energy Index", "iShares S&P Global Healthcare", "iShares S&P Global Financials", "iShares S&P Global 100 Index", "iShares MSCI Sweden Index", "iShares MSCI Emerging Markets Index", "iShares FTSE/Xinhua China 25 Index", "iShares MSCI BRIC Index", "iShares MSCI Thailand Invest Mkt Index"]
 
+metal_symbols = ["-", "-", "-", "-", "-", "-", "-", "-", "-", "-"]
+metal_names = ["Gold", "Silver", "Platinum", "Palladium", "Rhodium", "Copper", "Nickel", "Aluminium", "Zinc", "Lead"]
 
 ## GET ALL LISTS ##
 
 localmarkets = [indexesnames, usmarkets, eumarkets, otmarkets, currency_names,
-    etf_names]
+    etf_names, metal_names]
 localids = [idindexes, idusmarkets, ideumarkets, idotmarkets, currency_symbols,
-    etf_symbols]
+    etf_symbols, metal_symbols]
 
 wnamesindexes = [usindex_names, eurindex_names, othindex_names]
 widsindexes = [usindex_symbols, eurindex_symbols, othindex_symbols]