fix for nested dir names

Author: willmcgugan

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Fixed
+
+- Issue with duplicate nested directory names
+
+### Changed
+
+- Relaxed Boto requirement
 
 ## [0.1.2] - 2017-08-29
 

Makefile

@@ -8,12 +8,12 @@ release: readme
 
 .PHONY: test
 test:
-	nosetests --with-coverage --cover-erase --cover-package=fs_s3fs -a "!slow" fs_s3fs/tests
+	nosetests --with-coverage --cover-erase --logging-level=ERROR --cover-package=fs_s3fs -a "!slow" fs_s3fs/tests
 	rm .coverage
 
 .PHONY: slowtest
 slowtest:
-	nosetests --with-coverage --cover-erase --cover-package=fs_s3fs fs_s3fs/tests
+	nosetests --with-coverage --cover-erase --logging-level=ERROR --cover-package=fs_s3fs fs_s3fs/tests
 	rm .coverage
 
 .PHONY: testall

fs_s3fs/_s3fs.py

@@ -437,7 +437,7 @@ def listdir(self, path):
                 for prefix in common_prefixes:
                     _prefix = prefix.get('Prefix')
                     _name = _prefix[prefix_len:]
-                    if _name != _s3_key:
+                    if _name:
                         _directory.append(_name.rstrip(self.delimiter))
                 for obj in result.get('Contents', ()):
                     name = obj["Key"][prefix_len:]
@@ -635,7 +635,7 @@ def gen_info():
                 for prefix in common_prefixes:
                     _prefix = prefix.get('Prefix')
                     _name = _prefix[prefix_len:]
-                    if _name != _s3_key:
+                    if _name:
                         info = {
                             "basic": {
                                 "name": _name.rstrip(self.delimiter),

setup.py

@@ -23,7 +23,7 @@
     DESCRIPTION = f.read()
 
 REQUIREMENTS = [
-    "boto3~=1.4.5",
+    "boto3~=1.4.0",
     "fs~=2.0.7",
     "six~=1.10.0"
 ]