First version with python3 support.

* Moved requirements*.txt files to proper spec definitions in setup.py
 * Added a new fig.compat module to store some compatibility code
This commit is contained in:
Christopher Grebs 2014-01-05 18:26:32 -08:00 committed by Ben Firshman
commit 93b9b6fd9f
21 changed files with 83 additions and 27 deletions

View file

@ -1,3 +1,4 @@
from __future__ import unicode_literals
NAMES = [
'grey',
'red',

View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from __future__ import absolute_import
from docker import Client
import errno
import logging
@ -21,7 +23,7 @@ class Command(DocoptCommand):
def project(self):
try:
config = yaml.load(open('fig.yml'))
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
log.error("Can't find %s. Are you in the right directory?", e.filename)
else:

View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from __future__ import absolute_import
import sys
from inspect import getdoc

View file

@ -1,3 +1,4 @@
from __future__ import absolute_import
from textwrap import dedent

View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from __future__ import absolute_import
import texttable
import os

View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from __future__ import absolute_import
import sys
from itertools import cycle
@ -41,7 +43,7 @@ class LogPrinter(object):
'stream': True,
}
params.update(self.attach_params)
params = dict((name, 1 if value else 0) for (name, value) in params.items())
params = dict((name, 1 if value else 0) for (name, value) in list(params.items()))
return container.attach_socket(params=params, ws=True)
def read_websocket(websocket):

View file

@ -1,3 +1,4 @@
from __future__ import absolute_import
from threading import Thread
try:

View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from __future__ import absolute_import
import datetime
import os
import socket
@ -69,7 +71,7 @@ def prettydate(d):
return '{0} hours ago'.format(s/3600)
def mkdir(path, permissions=0700):
def mkdir(path, permissions=0o700):
if not os.path.exists(path):
os.mkdir(path)