Merge remote-tracking branch 'origin/master' into release

dbfilestorage/storage.py

@@ -12,7 +12,7 @@ from .models import DBFile
 L = logging.getLogger(__name__)
 
 
-class DBStorage(Storage):
+class DBFileStorage(Storage):
     """
         This is the Test Database file upload storage backend.
         This is used so that in our test database we always have uploaded

docs/Makefile

@@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXPROJ    = DjangoDBStorage
+SPHINXPROJ    = DjangoDBFileStorage
 SOURCEDIR     = .
 BUILDDIR      = _build
 

docs/conf.py

@@ -54,9 +54,9 @@ author = u'Tyrel Souza'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.0.4'
+version = u'0.1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'0.0.4'
+release = u'0.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/make.bat

@@ -9,7 +9,7 @@ if "%SPHINXBUILD%" == "" (
 )
 set SOURCEDIR=.
 set BUILDDIR=_build
-set SPHINXPROJ=DjangoDBStorage
+set SPHINXPROJ=DjangoDBFileStorage
 
 if "%1" == "" goto help
 

setup.py

@@ -10,7 +10,7 @@ except ImportError:
 
 setup(
     name="django-dbfilestorage",
-    version="0.0.4",
+    version="0.1.0",
     description="Database backed file storage for testing.",
     long_description="Database backed file storage for testing. Stores files as base64 encoded textfields.",
     author="Tyrel Souza",

tests/tests.py

@@ -8,7 +8,7 @@ from django.test import TestCase, Client
 from django.test.utils import override_settings
 
 PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
-DEFAULT_FILE_STORAGE = "dbfilestorage.storage.DBStorage"
+DEFAULT_FILE_STORAGE = "dbfilestorage.storage.DBFileStorage"
 
 
 @override_settings(DEFAULT_FILE_STORAGE=DEFAULT_FILE_STORAGE)