further distribution streamlinining

Author: dzsekijo

example/_find_fuse_parts.py

@@ -6,7 +6,7 @@
 
 for d in [ddd, '.']: 
     for p in glob.glob(join(d, 'build', 'lib.*')):
-         sys.path.append(p)
+        sys.path.insert(0, p)
 
 try:
     import fuse

example/hello.py

@@ -7,19 +7,13 @@
 #
 
 import os, stat, errno
-# some spaghetti to make it usable without fuse-py being installed
-for i in True, False:
-    try:
-        import fuse
-        from fuse import Fuse
-    except ImportError:
-        if i:
-            try:
-                import _find_fuse_parts
-            except ImportError:
-                pass
-        else:
-            raise
+# pull in some spaghetti to make this stuff work without fuse-py being installed
+try:
+    import _find_fuse_parts
+except ImportError:
+    pass
+import fuse
+from fuse import Fuse
 
 
 if not hasattr(fuse, '__version__'):

example/xmp.py

@@ -11,19 +11,13 @@
 from errno import *
 from stat import *
 import fcntl
-# some spaghetti to make it usable without fuse-py being installed
-for i in True, False:
-    try:
-        import fuse
-        from fuse import Fuse
-    except ImportError:
-        if i:
-            try:
-                import _find_fuse_parts
-            except ImportError:
-                pass
-        else:
-            raise
+# pull in some spaghetti to make this stuff work without fuse-py being installed
+try:
+    import _find_fuse_parts
+except ImportError:
+    pass
+import fuse
+from fuse import Fuse
 
 
 if not hasattr(fuse, '__version__'):

make_release.sh

@@ -3,19 +3,34 @@
 # Works only in the hg repo incarnation of the source tree.
 # Mercurial, docutils, setuptools needs to be installed.
 
-if ! hg log -r tip --template '{desc}' |  grep -q 'Added tag .* for changeset'; then
-    echo "you forgot to tag before release!" 2>&1
+setupdotpy_version=`python setup.py -V`
+
+# Finding out Mercurial cset until which we want to log
+hgid=`hg id | awk '{print $1}'`
+if echo $hgid | grep -q '+$'; then
+    echo "you have outstanding changes, don't make a release" >&2
     exit 1
 fi
-
-hg_tag="`hg tags | awk '{if ($0 !~ /^tip /) { print $1; exit; }}'`"
-setupdotpy_version="`python setup.py -V`"
-if ! [ "$hg_tag" = "$setupdotpy_version" ]; then
-    echo "HG tag '$hg_tag' doesn't match reported program version '$setupdotpy_version'" 2>&1
+hgrev=`hg log --template '{node|short} {rev}\n' | awk "{if (\\$1 ~ /$hgid/) { print \\$2 }}"`
+hgtiprev=`hg log --template '{rev}' -r tip`
+if ! [ $hgrev -eq $hgtiprev ]; then
+    (echo "*************"
+     echo "Warning: you are making a release from an older state of the code!"
+     echo "*************") >&2
+fi
+if hg log --template '{tags}' -r $hgid | egrep -q "(^| )$setupdotpy_version($| )"; then
+    log_to=$hgid
+elif [ $hgrev -gt 0 ] &&
+     hg log --template '{desc}' -r $hgid |  grep -q "Added tag $setupdotpy_version for changeset" &&
+     hg log --template '{tags}' -r $(($hgrev - 1)) | egrep -q "(^| )$setupdotpy_version($| )"; then
+    log_to=$(($hgrev - 1))
+else
+    echo "HG tag '$hg_tag' doesn't match reported program version '$setupdotpy_version'" >&2
     exit 1
 fi
 
-hg log --style util/fusepychangelog.tmpl | grep -v '^TAGS: tip$' > Changelog
+hg log --style util/fusepychangelog.tmpl -r $log_to:0 > Changelog
 rst2html.py --stylesheet util/voidspace-fusepy.css README.new_fusepy_api > README.new_fusepy_api.html
+(hg manif && echo Changelog && echo README.new_fusepy_api.html) > MANIFEST
 python setup.py sdist
 python setup.py bdist_egg