artiq: move namespace artiq.* -> artiq.language.*

perl -i -pe 's/^from artiq import \*$/from artiq.language import */' your_experiments/*.py

artiq/__init__.py

@@ -1,13 +1,3 @@
-from artiq import language
-from artiq.language import *
-from artiq.coredevice.dds import (PHASE_MODE_CONTINUOUS, PHASE_MODE_ABSOLUTE,
-                                  PHASE_MODE_TRACKING)
-
-__all__ = []
-__all__.extend(language.__all__)
-__all__ += ["PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE",
-            "PHASE_MODE_TRACKING"]
-
 from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions

artiq/language/__init__.py

@@ -1,5 +1,3 @@
-# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
-
 from artiq.language import core, types, environment, units, scan
 from artiq.language.core import *
 from artiq.language.types import *
@@ -7,6 +5,8 @@ from artiq.language.environment import *
 from artiq.language.units import *
 from artiq.language.scan import *
 
+from artiq.coredevice.dds import (PHASE_MODE_CONTINUOUS, PHASE_MODE_ABSOLUTE,
+                                  PHASE_MODE_TRACKING)
 
 __all__ = []
 __all__.extend(core.__all__)
@@ -14,3 +14,5 @@ __all__.extend(types.__all__)
 __all__.extend(environment.__all__)
 __all__.extend(units.__all__)
 __all__.extend(scan.__all__)
+__all__ += ["PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE",
+            "PHASE_MODE_TRACKING"]

artiq/test/coredevice/portability.py

@@ -1,7 +1,7 @@
 from operator import itemgetter
 from fractions import Fraction
 
-from artiq import *
+from artiq.language import *
 from artiq.sim import devices as sim_devices
 from artiq.test.hardware_testbench import ExperimentCase
 

artiq/test/scheduler.py

@@ -5,7 +5,7 @@ import sys
 import os
 from time import time, sleep
 
-from artiq import *
+from artiq.language import *
 from artiq.master.scheduler import Scheduler
 
 

artiq/test/worker.py

@@ -5,7 +5,7 @@ import sys
 import os
 from time import sleep
 
-from artiq import *
+from artiq.language import *
 from artiq.master.worker import *
 
 

doc/manual/core_language_reference.rst

@@ -1,7 +1,7 @@
 Core language reference
 =======================
 
-The most commonly used features from those modules can be imported with ``from artiq import *``.
+The most commonly used features from those modules can be imported with ``from artiq.language import *``.
 
 :mod:`artiq.language.core` module
 ---------------------------------

doc/manual/getting_started_core.rst

@@ -8,7 +8,7 @@ Connecting to the core device
 
 As a very first step, we will turn on a LED on the core device. Create a file ``led.py`` containing the following: ::
 
-    from artiq import *
+    from artiq.language import *
 
 
     class LED(EnvExperiment):
@@ -93,7 +93,7 @@ The point of running code on the core device is the ability to meet demanding re
 
 Create a new file ``rtio.py`` containing the following: ::
 
-    from artiq import *
+    from artiq.language import *
 
 
     class Tutorial(EnvExperiment):

doc/manual/getting_started_mgmt.rst

@@ -16,7 +16,7 @@ Then create a ``~/artiq-master/repository`` sub-folder to contain experiments. T
 
 Create a very simple experiment in ``~/artiq-master/repository`` and save it as ``mgmt_tutorial.py``: ::
 
-    from artiq import *
+    from artiq.language import *
 
 
     class MgmtTutorial(EnvExperiment):

examples/master/repository/arguments_demo.py

@@ -1,6 +1,6 @@
 import logging
 
-from artiq import *
+from artiq.language import *
 
 
 class SubComponent1(HasEnvironment):

examples/master/repository/coredevice_examples/photon_histogram.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class PhotonHistogram(EnvExperiment):

examples/master/repository/coredevice_examples/simple/blink_forever.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class BlinkForever(EnvExperiment):

examples/master/repository/coredevice_examples/simple/dds_test.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class DDSTest(EnvExperiment):

examples/master/repository/coredevice_examples/simple/handover.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class Handover(EnvExperiment):

examples/master/repository/coredevice_examples/simple/mandelbrot.py

@@ -1,6 +1,6 @@
 import sys
 
-from artiq import *
+from artiq.language import *
 
 
 class Mandelbrot(EnvExperiment):

examples/master/repository/coredevice_examples/tdr.py

@@ -1,6 +1,6 @@
 # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
-from artiq import *
+from artiq.language import *
 
 
 class PulseNotReceivedError(Exception):

examples/master/repository/coredevice_examples/transport.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from artiq import *
+from artiq.language import *
 
 from artiq.wavesynth.coefficients import SplineSource
 

examples/master/repository/flopping_f_simulation.py

@@ -5,7 +5,7 @@ import random
 import numpy as np
 from scipy.optimize import curve_fit
 
-from artiq import *
+from artiq.language import *
 
 
 def model(x, F0):

examples/master/repository/run_forever.py

@@ -1,7 +1,7 @@
 from itertools import count
 from time import sleep
 
-from artiq import *
+from artiq.language import *
 
 
 class RunForever(EnvExperiment):

examples/master/repository/speed_benchmark.py

@@ -1,6 +1,6 @@
 import time
 
-from artiq import *
+from artiq.language import *
 
 
 class _PayloadNOP(EnvExperiment):

examples/master/repository/utilities/dds_setter.py

@@ -1,6 +1,6 @@
 from operator import itemgetter
 
-from artiq import *
+from artiq.language import *
 
 
 class DDSSetter(EnvExperiment):

examples/master/repository/utilities/terminate_all.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class TerminateAll(EnvExperiment):

examples/sim/al_spectroscopy.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class AluminumSpectroscopy(EnvExperiment):

examples/sim/simple_simulation.py

@@ -1,4 +1,4 @@
-from artiq import *
+from artiq.language import *
 
 
 class SimpleSimulation(EnvExperiment):