Skip to content

Commit

Permalink
Do all compatibility imports first
Browse files Browse the repository at this point in the history
  • Loading branch information
maffoo committed Dec 22, 2016
1 parent 423a56b commit 23f372e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
3 changes: 2 additions & 1 deletion labrad/auth.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from __future__ import absolute_import

import getpass
from builtins import input

import getpass

from labrad import constants


Expand Down
3 changes: 2 additions & 1 deletion labrad/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
from __future__ import absolute_import
from __future__ import print_function

from past.builtins import basestring # for python 2/3 compatibility

import functools
import inspect
import itertools
import types

import twisted.internet.defer as defer
from past.builtins import basestring # for python 2/3 compatibility

from labrad import types as T, util

Expand Down
3 changes: 2 additions & 1 deletion labrad/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@

from __future__ import print_function

import hashlib
from builtins import input

import hashlib

from twisted.internet import reactor, protocol, defer
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.python import failure, log
Expand Down
5 changes: 3 additions & 2 deletions labrad/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
from __future__ import absolute_import
from __future__ import print_function

from builtins import range
from future.utils import with_metaclass

import collections
import datetime
import itertools
Expand All @@ -37,8 +40,6 @@
import sys
import time
import warnings
from builtins import range
from future.utils import with_metaclass

import numpy as np

Expand Down
3 changes: 2 additions & 1 deletion labrad/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@

from __future__ import print_function

from builtins import range

import copy, re, textwrap
import contextlib
import os
import sys
from builtins import range

from twisted.internet import defer, reactor
from twisted.internet.defer import inlineCallbacks, returnValue
Expand Down
1 change: 1 addition & 0 deletions labrad/util/hydrant.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from __future__ import print_function

from builtins import input, range

from datetime import datetime, timedelta
from random import choice, randint, gauss

Expand Down

0 comments on commit 23f372e

Please sign in to comment.