Merge remote-tracking branch 'official/master' into parse_stream

Author: alanjds

.travis.yml

@@ -12,7 +12,8 @@ install:
   - pip install -q -r requirements.txt
   - pip install --editable .
 script:
-  - pytest -v --tb=native --cov --flake8
+  - flake8 .
+  - pytest -v --tb=native --cov
 after_success:
   - coveralls
 deploy:

README.rst

@@ -22,7 +22,7 @@ production using `12-factor <http://12factor.net/>`__ principles.
 -  `Command-line interface <#command-line-interface>`__
 -  `iPython Support <#ipython-support>`__
 -  `Setting config on remote servers <#setting-config-on-remote-servers>`__
--  `Related Projects <#releated-projects>`__
+-  `Related Projects <#related-projects>`__
 -  `Contributing <#contributing>`__
 -  `Changelog <#changelog>`__
 
@@ -269,6 +269,7 @@ Related Projects
 -  `django-dotenv <https://github.com/jpadilla/django-dotenv>`__
 -  `django-environ <https://github.com/joke2k/django-environ>`__
 -  `django-configuration <https://github.com/jezdez/django-configurations>`__
+-  `dump-env <https://github.com/sobolevn/dump-env>`__
 
 Contributing
 ============

dotenv/main.py

@@ -111,7 +111,7 @@ def parse_dotenv(dotenv_path=None, stream=None):
         k, v = k.strip(), v.strip().encode('unicode-escape').decode('ascii')
 
         if len(v) > 0:
-            quoted = v[0] == v[len(v) - 1] in ['"', "'"]
+            quoted = v[0] == v[-1] in ['"', "'"]
 
             if quoted:
                 v = decode_escaped(v[1:-1])

requirements.txt

@@ -4,6 +4,5 @@ sh>=1.09
 bumpversion
 wheel
 pytest-cov
-pytest-flake8
 click
 ipython