summaryrefslogtreecommitdiff
path: root/fs/commands
diff options
context:
space:
mode:
authorwillmcgugan@gmail.com <willmcgugan@gmail.com@67cdc799-7952-0410-af00-57a81ceafa0f>2014-03-13 18:47:17 +0000
committerwillmcgugan@gmail.com <willmcgugan@gmail.com@67cdc799-7952-0410-af00-57a81ceafa0f>2014-03-13 18:47:17 +0000
commit221c3725f109ed5a6126c1f406cda68f55d95894 (patch)
tree29b872dda5258bb8a4b73a0df9bfe568b495c6d8 /fs/commands
parent5142e4da3e4a838b256c5c582a25ad0fdbb9bf49 (diff)
downloadpyfilesystem-221c3725f109ed5a6126c1f406cda68f55d95894.tar.gz
Test fixes and preparations for 0.5.0 release
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@887 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs/commands')
-rw-r--r--fs/commands/runner.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/fs/commands/runner.py b/fs/commands/runner.py
index c5c7e6f..57d6e99 100644
--- a/fs/commands/runner.py
+++ b/fs/commands/runner.py
@@ -1,17 +1,19 @@
import warnings
warnings.filterwarnings("ignore")
-import sys
-from optparse import OptionParser
from fs.opener import opener, OpenerError, Opener
from fs.errors import FSError
from fs.path import splitext, pathsplit, isdotfile, iswildcard
+
+import re
+import sys
import platform
-from collections import defaultdict
import six
+from optparse import OptionParser
+from collections import defaultdict
-if platform.system() == 'Windows':
+if platform.system() == 'Windows':
def getTerminalSize():
try:
## {{{ http://code.activestate.com/recipes/440694/ (r3)
@@ -32,13 +34,12 @@ if platform.system() == 'Windows':
sizex = right - left + 1
sizey = bottom - top + 1
else:
- sizex, sizey = 80, 25 # can't determine actual size - return default values
+ sizex, sizey = 80, 25 # can't determine actual size - return default values
return sizex, sizey
except:
return 80, 25
else:
-
def getTerminalSize():
def ioctl_GWINSZ(fd):
try:
@@ -65,11 +66,13 @@ else:
pass
return 80, 25
+
def _unicode(text):
if not isinstance(text, unicode):
return text.decode('ascii', 'replace')
return text
+
class Command(object):
usage = ''
@@ -146,6 +149,7 @@ class Command(object):
if not self.terminal_colors:
return text
re_fs = r'(\S*?://\S*)'
+
def repl(matchobj):
fs_url = matchobj.group(0)
return self.wrap_link(fs_url)