Merge branch 'master' of https://git.km3net.de/km3py/km3io

.gitignore

@@ -7,7 +7,7 @@ __pycache__/
 *.so
 
 # Version info for PyPI
-km3noroot/version.txt
+km3io/version.txt
 
 # Distribution / packaging
 .Python

Makefile

@@ -15,10 +15,10 @@ clean:
 	python setup.py clean --all
 
 test: 
-	py.test --junitxml=./reports/junit.xml -o junit_suite_name=$(PKGNAME) $(PKGNAME)
+	py.test --junitxml=./reports/junit.xml -o junit_suite_name=$(PKGNAME) tests
 
 test-cov:
-	py.test --cov ./ --cov-report term-missing --cov-report xml:reports/coverage.xml --cov-report html:reports/coverage $(PKGNAME)
+	py.test --cov $(PKGNAME) --cov-report term-missing --cov-report xml:reports/coverage.xml --cov-report html:reports/coverage tests
 
 test-loop: 
 	py.test $(PKGNAME)

km3io/reader.py

@@ -125,14 +125,14 @@ class AanetReader:
 
     @property
     def get_hits_keys(self):
-        if self._hits_keys = None:
+        if self._hits_keys is None:
             hits_tree = self.data['Evt']['hits']
             self._hits_keys = [key.decode('utf8') for key in hits_tree.keys()]
         return self._hits_keys
 
     @property
     def get_tracks_keys(self):
-        if self._tracks_keys = None:
+        if self._tracks_keys is None:
             tracks_tree = self.data['Evt']['trks']
             self._tracks_keys = [key.decode('utf8') for key in tracks_tree.keys()]
         return self._tracks_keys