change namespace to 'skisolr'

CHANGELOG.txt

@@ -1,5 +1,6 @@
 === 1.0.0pre1 (Unreleased) ===
 
+- Change module namespace to 'skisolr'
 - Use nose and coverage for tests
 - Remove Python 2.6 support
 - Add Solr.system_info to call Solr SystemInfoHandler

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) Joseph Kocherhans, Jacob Kaplan-Moss, Daniel Lindsley.
+Copyright (c) Joseph Kocherhans, Jacob Kaplan-Moss, Daniel Lindsley, Tadas Dailyda.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@ are permitted provided that the following conditions are met:
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-    3. Neither the name of pysolr nor the names of its contributors may be used
+    3. Neither the name of skisolr nor the names of its contributors may be used
        to endorse or promote products derived from this software without
        specific prior written permission.
 

README.rst

@@ -38,7 +38,7 @@ Requirements
 Installation
 ============
 
-``sudo python setup.py install`` or drop the ``pysolr.py`` file anywhere on your
+``sudo python setup.py install`` or drop the ``skisolr.py`` file anywhere on your
 PYTHONPATH.
 
 
@@ -49,12 +49,11 @@ Basic usage looks like:
 
 .. code-block:: python
 
-    # If on Python 2.X
-    from __future__ import print_function
-    import pysolr
+    from __future__ import print_function  # If on Python 2.X
+    from skisolr import Solr
 
     # Setup a Solr instance. The timeout is optional.
-    solr = pysolr.Solr('http://localhost:8983/solr/', timeout=10)
+    solr = Solr('http://localhost:8983/solr/', timeout=10)
 
     # How you'd index data.
     solr.add([

setup.cfg

@@ -5,13 +5,13 @@ exclude=docs
 [isort]
 line_length=110
 default_section=THIRDPARTY
-known_first_party=pysolr
+known_first_party=skisolr
 
 [wheel]
 universal = 1
 
 [nosetests]
 with-coverage=1
-cover-package=pysolr
+cover-package=skisolr
 cover-erase=1
 verbosity=2

setup.py

@@ -13,7 +13,7 @@
     author_email='tadas@dailyda.com',
     long_description=open('README.rst', 'r').read(),
     py_modules=[
-        'pysolr'
+        'skisolr'
     ],
     classifiers=[
         'Development Status :: 4 - Beta',

pysolr.py → skisolr.py

@@ -73,7 +73,7 @@ def emit(self, record):
 
 # Add the ``NullHandler`` to avoid logging by default while still allowing
 # others to attach their own handlers.
-LOG = logging.getLogger('pysolr')
+LOG = logging.getLogger('skisolr')
 h = NullHandler()
 LOG.addHandler(h)
 
@@ -249,15 +249,15 @@ class Results(object):
 
     Other response metadata (debug, highlighting, qtime, etc.) are available
     as attributes. Note that not all response keys may be covered for current
-    version of pysolr. If you're sure that your queries return
+    version of skisolr. If you're sure that your queries return
     something that is missing you can easily extend ``Results``
-    and provide it as a custom results class to ``pysolr.Solr``.
+    and provide it as a custom results class to ``skisolr.Solr``.
 
     Example::
 
-        import pysolr
+        import skisolr
 
-        class CustomResults(pysolr.Results):
+        class CustomResults(skisolr.Results):
             def __init__(self, decoded):
                  self.some_new_attribute = decoded.get('not_covered_key' None)
                  super(self, CustomResults).__init__(decoded)
@@ -301,17 +301,17 @@ class Solr(object):
 
     Optionally accepts ``results_cls`` that specifies class of results object
     returned by ``.search()`` and ``.more_like_this()`` methods.
-    Default is ``pysolr.Results``.
+    Default is ``skisolr.Results``.
 
     Usage::
 
-        solr = pysolr.Solr('http://localhost:8983/solr')
+        solr = skisolr.Solr('http://localhost:8983/solr')
         # With a 10 second timeout.
 
-        solr = pysolr.Solr('http://localhost:8983/solr', timeout=10)
+        solr = skisolr.Solr('http://localhost:8983/solr', timeout=10)
 
-        # with a dict as a default results class instead of pysolr.Results
-        solr = pysolr.Solr('http://localhost:8983/solr', results_cls=dict)
+        # with a dict as a default results class instead of skisolr.Results
+        solr = skisolr.Solr('http://localhost:8983/solr', results_cls=dict)
 
     """
     def __init__(self, url, decoder=None, timeout=60, results_cls=Results):
@@ -681,7 +681,7 @@ def search(self, q, **kwargs):
         through the Solr URL.
 
         Returns ``self.results_cls`` class object (defaults to
-        ``pysolr.Results``)
+        ``skisolr.Results``)
 
         Usage::
 
@@ -712,7 +712,7 @@ def more_like_this(self, q, mltfl, **kwargs):
         Finds and returns results similar to the provided query.
 
         Returns ``self.results_cls`` class object (defaults to
-        ``pysolr.Results``)
+        ``skisolr.Results``)
 
         Requires Solr 1.3+.
 

tests/admin.py

@@ -3,7 +3,7 @@
 
 import unittest
 
-from pysolr import SolrCoreAdmin
+from skisolr import SolrCoreAdmin
 
 
 class SolrCoreAdminTestCase(unittest.TestCase):

tests/client.py

@@ -4,8 +4,8 @@
 import datetime
 import unittest
 
-from pysolr import (ET, IS_PY3, NESTED_DOC_KEY, Results, Solr, SolrError, clean_xml_string, force_bytes,
-                    force_unicode, json, safe_urlencode, sanitize, unescape_html)
+from skisolr import (ET, IS_PY3, NESTED_DOC_KEY, Results, Solr, SolrError, clean_xml_string, force_bytes,
+                     force_unicode, json, safe_urlencode, sanitize, unescape_html)
 
 try:
     from urllib.parse import unquote_plus