Merge pull request #11 from IanLee1521/master

Fix typo, add pip requirements file, test for kml.KML.from_string when not a kml string
Thanks 8-)

.travis.yml

@@ -9,14 +9,13 @@ python:
 env:
     - LXML=true
     - LXML=false
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-# install: PLEASE CHANGE ME
+
+# command to install dependencies, e.g. pip install -r requirements.txt
 install:
-    - pip install coveralls --use-mirrors
-    - if $LXML == true; then pip install --use-mirrors lxml; fi
+    - pip install -r requirements/test.txt
+    - if $LXML == true; then pip install lxml; fi
 
 # command to run tests, e.g. python setup.py test
-
 script:
     coverage run --source=fastkml setup.py test
 

README.rst

@@ -28,6 +28,18 @@ fastkml is continually tested with *Travis CI*
     :target: https://www.ohloh.net/p/fastkml
 
 
+Requirements
+============
+
+You can install the requirements for fastkml by using pip:
+
+    pip install -r requirements/common.txt
+
+To install packages required for running tests:
+
+    pip install -r requirements/test.txt
+
+
 Limitations
 ===========
 

fastkml/atom.py

@@ -79,12 +79,12 @@ class Link(object):
     title = None
     # human readable information about the link
 
-    lenght = None
+    length = None
     # the length of the resource, in bytes
 
 
     def __init__(self, ns=None, href=None, rel=None, type=None,
-                hreflang=None, title=None, lenght=None):
+                hreflang=None, title=None, length=None):
         if ns == None:
             self.ns = NS
         else:
@@ -94,7 +94,7 @@ class Link(object):
         self.type = type
         self.hreflang = hreflang
         self.title = title
-        self.lenght = lenght
+        self.length = length
 
     def from_string(self, xml_string):
         self.from_element(etree.XML(xml_string))
@@ -117,8 +117,8 @@ class Link(object):
                 self.hreflang = element.get('hreflang')
             if element.get('title'):
                 self.title = element.get('title')
-            if element.get('lenght'):
-                self.lenght = element.get('lenght')
+            if element.get('length'):
+                self.length = element.get('length')
 
 
     def etree_element(self):
@@ -135,8 +135,8 @@ class Link(object):
             element.set('hreflang', self.hreflang)
         if self.title:
             element.set('title', self.title)
-        if self.lenght:
-            element.set('lenght', self.lenght)
+        if self.length:
+            element.set('length', self.length)
         return element
 
     def to_string(self, prettyprint=True):

fastkml/test_main.py

@@ -685,6 +685,10 @@ class KmlFromStringTestCase( unittest.TestCase ):
         self.assertFalse('maxLines' in k.to_string())
         self.assertTrue('Diffrent Snippet' in k.to_string())
 
+    def test_from_wrong_string(self):
+        doc = kml.KML()
+        self.assertRaises(TypeError, doc.from_string, '<xml></xml>')
+
 
 class StyleTestCase( unittest.TestCase ):
 
@@ -1333,13 +1337,13 @@ class AtomTestCase( unittest.TestCase ):
         l.title="Title"
         l.type="text/html"
         l.hreflang ='en'
-        l.lenght="4096"
+        l.length="4096"
         self.assertTrue('href="http://localhost/"' in str(l.to_string()))
         self.assertTrue('rel="alternate"' in str(l.to_string()))
         self.assertTrue('title="Title"' in str(l.to_string()))
         self.assertTrue('hreflang="en"' in str(l.to_string()))
         self.assertTrue('type="text/html"' in str(l.to_string()))
-        self.assertTrue('lenght="4096"' in str(l.to_string()))
+        self.assertTrue('length="4096"' in str(l.to_string()))
         self.assertTrue('link' in str(l.to_string()))
         self.assertTrue('="http://www.w3.org/2005/Atom"' in str(l.to_string()))
         l2 = atom.Link()

requirements/common.txt

+pygeoif
+python-dateutil

requirements/test.txt

+-r common.txt
+
+pytest
+coveralls