From cc0a2bb4e85eab1741b0ce2827249977ce3280a9 Mon Sep 17 00:00:00 2001
From: russellballestrini <devnull@localhost>
Date: Sat, 23 Jan 2016 21:38:59 -0500
Subject: [PATCH] changed setup.py removed miniuri.py

---
 miniuri.py | 121 -----------------------------------------------------
 setup.py   |   9 ++--
 2 files changed, 6 insertions(+), 124 deletions(-)
 delete mode 100644 miniuri.py

diff --git a/miniuri.py b/miniuri.py
deleted file mode 100644
index dc6b47e..0000000
--- a/miniuri.py
+++ /dev/null
@@ -1,121 +0,0 @@
-class Uri( object ):
-    """
-    miniuri is a universal URI parser class.
-    The parser grants access to the following attributes:
-
-    foo://username:password@test.com:808/go/to/index.php?pet=cat&name=bam#eye
-    \_/   \_______________/ \______/ \_/       \___/ \_/ \_______________/\_/
-     |           |             |      |          |    |       |            | 
-     |       userinfo       hostname  |          |    |      query   fragment
-     |    \___________________________|/\________|____|_/
-     |                  |             |      |   |    |
-    scheme          authority         |    path  |  extension
-                                      |          |
-                                     port     filename
-    """
-    def __init__( self, uri = None ):
-        if uri: self.uri = uri # invoke uri.setter
-
-    def __str__(self): return self.uri
-
-    @property
-    def uri( self ):
-        """build and return uri from attributes"""
-        scheme = path = filename = query = fragment = ''
-        if self.scheme: scheme = self.scheme + '://'
-        if self.path: path = self.path
-        if self.query: query = '?' + self.query
-        if self.fragment: fragment = '#' + self.fragment
-        return ''.join([scheme,self.authority,path,filename,query,fragment])
-
-    @uri.setter
-    def uri( self, uri ):
-        """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 
-
-        if '://' in uri: # attempt to parse scheme
-            self.scheme, uri = uri.split( '://' )
-
-        # invoke authority setter
-        self.authority = uri.split( '/' )[0]
-
-        uri = uri[ len( self.authority ): ] 
-
-        if '#' in uri: # set fragment
-            uri, self.fragment = uri.split( '#' )  
-        
-        if '?' in uri: 
-            self.path, self.query = uri.split( '?' )
-        else:
-            self.path = uri
-        
-    @property
-    def authority( self ):
-        """return a authority string from attributes"""
-        a = ''
-        if self.username:
-            a += self.username
-            if self.password: a += ':' + self.password
-            a += '@'
-        a += self.hostname
-        if self.port: a += ':' + self.port
-        return a
-
-    @authority.setter
-    def authority( self, a ):
-        """set all the attribute that makeup a authority"""
-        self.username = self.password = self.port = None
-        self.hostname = a
-        if '@' in self.hostname:
-            self.userinfo, self.hostname = a.split( '@' ) # userinfo setter
-        if ':' in self.hostname:
-            self.hostname, self.port = self.hostname.split( ':' )
-
-    @property
-    def userinfo( self ):
-        """return username:password, username, or None"""
-        if self.username:
-            if self.password: 
-                return self.username + ':' + self.password
-            return self.username
-
-    @userinfo.setter
-    def userinfo( self, info ):
-        """set username and password"""
-        self.username, self.password = info, None 
-        if ':' in info:
-            self.username, self.password = info.split( ':' )
-
-    @property
-    def path(self):
-        """return path"""
-        p = self._path if self._path is not None else ''
-        f = self.filename if self.filename is not None else ''
-        return p + f
-
-    @path.setter
-    def path(self, new_path):
-        if new_path:
-            self.filename = new_path.split('/')[-1]
-            self._path = new_path.rstrip(self.filename)
-        else:
-            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 self._filename
-
-    @filename.setter
-    def filename(self, new_filename):
-        if new_filename:
-            self.extension = new_filename.split('.')[-1] if '.' in new_filename else None
-            self._filename = new_filename.split('.')[0]
-
diff --git a/setup.py b/setup.py
index a085e93..d64736a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,13 @@
 # installation: pip install miniuri
 
-from setuptools import setup
+from setuptools import (
+  setup,
+  find_packages,
+)
 
 setup( 
     name='miniuri',
-    version='1.0.0',
+    version='1.0.1',
     long_description = open('README').read(),
     description='miniuri: The Universal URI Parser',
     keywords = 'miniuri uri url parser',
@@ -16,7 +19,7 @@ setup(
     platforms=['All'],
     license='Public Domain',
 
-    py_modules = ['miniuri'],
+    packages = find_packages(),
     include_package_data=True,
 
     classifiers = [