← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/glance/folsom

« back to all changes in this revision

Viewing changes to glance/openstack/common/timeutils.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2012-09-07 12:17:46 UTC
  • mfrom: (1.1.42)
  • Revision ID: package-import@ubuntu.com-20120907121746-a4i0aewhlzb7vw31
Tags: 2012.2~rc1~20120907.129.f0bd856-0ubuntu1
https://launchpad.net/bugs/820688
[ Chuck Short ]
* New upstream version.
* drop debian/patches/fix-docs-build.patch. 
* debian/rules: Re-activate tests.
* debain/control: Add depends on python-swiftclient.
* debian/*.usptart: make glance start from runlevel 1 to runlevel
  2. (LP: #820688)

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* New snapshot.
* Refresh disable-network-for-docs.patch
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/openstack/common/timeutils.py
93
93
 
94
94
 
95
95
def advance_time_delta(timedelta):
96
 
    """Advance overriden time using a datetime.timedelta."""
 
96
    """Advance overridden time using a datetime.timedelta."""
97
97
    assert(not utcnow.override_time is None)
98
98
    utcnow.override_time += timedelta
99
99
 
100
100
 
101
101
def advance_time_seconds(seconds):
102
 
    """Advance overriden time by seconds."""
 
102
    """Advance overridden time by seconds."""
103
103
    advance_time_delta(datetime.timedelta(0, seconds))
104
104
 
105
105
 
106
106
def clear_time_override():
107
107
    """Remove the overridden time."""
108
108
    utcnow.override_time = None
 
109
 
 
110
 
 
111
def marshall_now(now=None):
 
112
    """Make an rpc-safe datetime with microseconds.
 
113
 
 
114
    Note: tzinfo is stripped, but not required for relative times."""
 
115
    if not now:
 
116
        now = utcnow()
 
117
    return dict(day=now.day, month=now.month, year=now.year, hour=now.hour,
 
118
                minute=now.minute, second=now.second,
 
119
                microsecond=now.microsecond)
 
120
 
 
121
 
 
122
def unmarshall_time(tyme):
 
123
    """Unmarshall a datetime dict."""
 
124
    return datetime.datetime(day=tyme['day'], month=tyme['month'],
 
125
                 year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'],
 
126
                 second=tyme['second'], microsecond=tyme['microsecond'])