From e9ffead4ece07e987328af1842f03d48d36d8208 Mon Sep 17 00:00:00 2001
From: russellballestrini <devnull@localhost>
Date: Mon, 1 Feb 2016 22:13:20 -0500
Subject: [PATCH] fixed tests.

changed miniuri/miniuri.py
changed test_miniuri.py
---
 miniuri/miniuri.py | 15 +++++++++------
 test_miniuri.py    |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/miniuri/miniuri.py b/miniuri/miniuri.py
index 5e01953..2620a02 100644
--- a/miniuri/miniuri.py
+++ b/miniuri/miniuri.py
@@ -33,7 +33,7 @@ class Uri( object ):
         """parse and set all uri attributes"""
         self.scheme = self.username = self.password = None
         self.hostname = self.port = self.path = None
-        self.filename = self.extension = self.query = self.fragment = None 
+        self.filename = self.query = self.fragment = None 
 
         if '://' in uri: # attempt to parse scheme
             self.scheme, uri = uri.split( '://' )
@@ -99,21 +99,24 @@ class Uri( object ):
             self.filename = new_path.split('/')[-1]
             self._path = new_path.rstrip(self.filename)
         else:
+            self.filename = None
             self._path = None
-            self._filename = None
-            self._extension = None
 
     @property
     def filename(self):
         """return filename"""
         if self._filename: 
             if self.extension:
-                return self._filename + '.' + self.extension
+                return '{}.{}'.format(self._filename, self.extension)
             return self._filename
+        return ''
 
     @filename.setter
     def filename(self, new_filename):
+        self.extension = ''
         if new_filename:
-            self.extension = new_filename.split('.')[-1] if '.' in new_filename else None
             self._filename = new_filename.split('.')[0]
-
+            if '.' in new_filename:
+                self.extension = new_filename.split('.')[-1]
+        else:
+            self._filename = None
diff --git a/test_miniuri.py b/test_miniuri.py
index c1f833c..3b2a57a 100644
--- a/test_miniuri.py
+++ b/test_miniuri.py
@@ -58,7 +58,7 @@ class TestMiniUri(TestCase):
         self.assertEqual(self.u.port, '81')
         self.assertEqual(self.u.path, '')
         self.assertEqual(self.u.filename, '')
-        self.assertEqual(self.u.extention, '')
+        self.assertEqual(self.u.extension, '')
 
     def test_uri_filename_only_path(self):
         self.u = Uri('https://fox:pass@www.foxhop.net:81/filename.jpg?p=2#5')