slimming down the repo

diff --git a/HACKING b/HACKING
deleted file mode 100644 (file)
index f23d6fb..0000000
--- a/HACKING
+++ /dev/null
@@ -1,15 +0,0 @@
-Where possible, please follow PEP8 with regard to coding style. Sometimes the
-line length restriction is too hard to follow, so don't bend over backwards
-there.
-
-Triple-quotes should always be """, single quotes are ' unless using " would
-result in less escaping within the string.
-
-All modules, functions, and methods should be well documented reStructuredText
-for Sphinx AutoDoc.
-
-All functionality should be available in pure Python. Optional C (via Cython)
-implementations may be written for performance reasons, but should never
-replace the Python implementation.
-
-Lastly, don't take yourself too seriously :)

diff --git a/requests/config.py b/requests/config.py
index 794109c5303f9b6fa5b315f054ffd4cbeba7df17..676a5f0e2ac04bd1e2b46b7d58d992f64708c639 100644 (file)
--- a/requests/config.py
+++ b/requests/config.py
@@ -9,48 +9,11 @@ This module provides the Requests settings feature set.
 """
 
 class Settings(object):
-    _singleton = {}
-
-    # attributes with defaults
-    __attrs__ = []
 
     def __init__(self, **kwargs):
         super(Settings, self).__init__()
 
-        self.__dict__ = self._singleton
-
-
-    def __call__(self, *args, **kwargs):
-        # new instance of class to call
-        r = self.__class__()
-
-        # cache previous settings for __exit__
-        r.__cache = self.__dict__.copy()
-        map(self.__cache.setdefault, self.__attrs__)
-
-        # set new settings
-        self.__dict__.update(*args, **kwargs)
-
-        return r
-
-
-    def __enter__(self):
-        pass
-
-
-    def __exit__(self, *args):
-
-        # restore cached copy
-        self.__dict__.update(self.__cache.copy())
-        del self.__cache
-
-
     def __getattribute__(self, key):
-        if key in object.__getattribute__(self, '__attrs__'):
-            try:
-                return object.__getattribute__(self, key)
-            except AttributeError:
-                return None
         return object.__getattribute__(self, key)
 
 

diff --git a/tox.ini b/tox.ini
deleted file mode 100644 (file)
index b0fc213..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-envlist = py25,py26,py27
-
-[testenv]
-commands=py.test --junitxml=junit-{envname}.xml
-deps =
-    pytest
-    omnijson
\ No newline at end of file