From 6383d344e2b023ebf3375174d06a7fe156699ee9 Mon Sep 17 00:00:00 2001
From: Wouter Peters <wouter.peters@wur.nl>
Date: Mon, 1 Oct 2012 12:30:26 +0000
Subject: [PATCH] clean up of unneeded imports
---
da/analysis/tools_country.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/da/analysis/tools_country.py b/da/analysis/tools_country.py
index 7381ece..8355e62 100755
--- a/da/analysis/tools_country.py
+++ b/da/analysis/tools_country.py
@@ -22,6 +22,8 @@ The country data only covers the land areas of a nation and aggregation will exc
by oceans, sea, or open water. The aggregation will thus work best on arrays that are *not* defined by unit area!
"""
+import sys
+sys.path.append('../../')
try:
from dbfpy import dbf
except:
@@ -29,7 +31,7 @@ except:
print "http://dbfpy.sourceforge.net/"
print " Trying to complete anyway..."
from numpy import sum, array
-from tm5tools import globarea
+from da.analysis.tools_regions import globarea
EU25 = ["Austria", "Belgium", "Cyprus","Czech Republic", "Denmark", "Estonia", "Finland", "France", "Germany", "Greece", "Hungary", "Ireland", "Italy", "Latvia", "Lithuania", "Luxembourg", "Malta", "Netherlands", "Poland", "Portugal", "Slovakia", "Slovenia", "Spain", "Sweden","United Kingdom"]
EU27 = ["Austria", "Belgium", "Bulgaria", "Cyprus","Czech Republic", "Denmark", "Estonia", "Finland", "France", "Germany", "Greece", "Hungary", "Ireland", "Italy", "Latvia", "Lithuania", "Luxembourg", "Malta", "Netherlands", "Poland", "Portugal", "Romania", "Slovakia", "Slovenia", "Spain", "Sweden","United Kingdom"]
@@ -128,7 +130,6 @@ def fix_eu(rec):
def get_countrydict():
""" Create a dictionary with grid-to-country information from a dbf file"""
import cPickle
- import mysettings
import os
file=os.path.join('country_dictionary.dat')
--
GitLab